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

search: move settings and dotcommode from Plan to client (#53234)

Browse Source 
We always passed in envvar.SourcegraphDotComMode() for dot com mode.
Additionally this variable doesn't change per request, so makes more
request to be set in the client at construction time.

We always called settings.CurrentUserFinal before calling Plan. Now that
settings can be a service, we make it part of the client struct as well.
This also makes sense from the perspective that plan should only be
taking in the per request information, then the client does actions
based on that.

Both these changes simplify much of the call sites which is a nice side
effect.

Test Plan: CI
This commit is contained in:
Keegan Carruthers-Smith 2023-06-09 16:57:19 +02:00 committed by GitHub
parent a770402c45
commit 690f1bacb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 44 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/frontend/graphqlbackend/search.go
View File

@ -5,12 +5,10 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/internal/database"
"github.com/sourcegraph/sourcegraph/internal/search"
"github.com/sourcegraph/sourcegraph/internal/search/client"
"github.com/sourcegraph/sourcegraph/internal/search/job/jobutil"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/lib/errors"
)
@ -28,11 +26,6 @@ type SearchImplementer interface {
// NewBatchSearchImplementer returns a SearchImplementer that provides search results and suggestions.
func NewBatchSearchImplementer(ctx context.Context, logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJobs, args *SearchArgs) (_ SearchImplementer, err error) {
settings, err := settings.CurrentUserFinal(ctx, db)
if err != nil {
return nil, err
}
cli := client.New(logger, db, enterpriseJobs)
inputs, err := cli.Plan(
ctx,
@ -41,8 +34,6 @@ func NewBatchSearchImplementer(ctx context.Context, logger log.Logger, db databa
args.Query,
search.Precise,
search.Batch,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
var queryErr *client.QueryError

6
cmd/frontend/graphqlbackend/search_results_test.go
View File

@ -330,8 +330,6 @@ func TestSearchResultsHydration(t *testing.T) {
query,
search.Precise,
search.Batch,
&schema.Settings{},
false,
)
if err != nil {
t.Fatal(err)
@ -568,8 +566,6 @@ func TestEvaluateAnd(t *testing.T) {
tt.query,
search.Precise,
search.Batch,
&schema.Settings{},
false,
)
if err != nil {
t.Fatal(err)
@ -676,8 +672,6 @@ func TestSubRepoFiltering(t *testing.T) {
tt.searchQuery,
search.Precise,
search.Batch,
&schema.Settings{},
false,
)
if err != nil {
t.Fatal(err)

2
cmd/frontend/internal/search/BUILD.bazel generated
View File

@ -12,7 +12,6 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search",
visibility = ["//cmd/frontend:__subpackages__"],
deps = [
"//cmd/frontend/envvar",
"//cmd/frontend/graphqlbackend",
"//cmd/frontend/internal/highlight",
"//cmd/frontend/internal/search/logs",
@ -32,7 +31,6 @@ go_library(
"//internal/search/streaming/api",
"//internal/search/streaming/client",
"//internal/search/streaming/http",
"//internal/settings",
"//internal/trace",
"//internal/types",
"//lib/errors",

9
cmd/frontend/internal/search/search.go
View File

@ -18,7 +18,6 @@ import (
"github.com/sourcegraph/log"
"go.opentelemetry.io/otel/attribute"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
searchlogs "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search/logs"
"github.com/sourcegraph/sourcegraph/internal/api"
@ -34,7 +33,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
streamclient "github.com/sourcegraph/sourcegraph/internal/search/streaming/client"
streamhttp "github.com/sourcegraph/sourcegraph/internal/search/streaming/http"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/internal/trace"
"github.com/sourcegraph/sourcegraph/internal/types"
"github.com/sourcegraph/sourcegraph/lib/errors"
@ -100,11 +98,6 @@ func (h *streamHandler) serveHTTP(r *http.Request, tr *trace.Trace, eventWriter
attribute.Int("search_mode", args.SearchMode),
)
settings, err := settings.CurrentUserFinal(ctx, h.db)
if err != nil {
return err
}
inputs, err := h.searchClient.Plan(
ctx,
args.Version,
@ -112,8 +105,6 @@ func (h *streamHandler) serveHTTP(r *http.Request, tr *trace.Trace, eventWriter
args.Query,
search.Mode(args.SearchMode),
search.Streaming,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
var queryErr *client.QueryError

2
cmd/frontend/internal/search/search_test.go
View File

@ -186,7 +186,7 @@ func TestDisplayLimit(t *testing.T) {
mockInput := make(chan streaming.SearchEvent)
mock := client.NewMockSearchClient()
mock.PlanFunc.SetDefaultHook(func(_ context.Context, _ string, _ *string, queryString string, _ search.Mode, _ search.Protocol, _ *schema.Settings, _ bool) (*search.Inputs, error) {
mock.PlanFunc.SetDefaultHook(func(_ context.Context, _ string, _ *string, queryString string, _ search.Mode, _ search.Protocol) (*search.Inputs, error) {
q, err := query.Parse(queryString, query.SearchTypeLiteral)
require.NoError(t, err)
return &search.Inputs{

2
dev/internal/cmd/search-plan/BUILD.bazel generated
View File

@ -7,6 +7,7 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/dev/internal/cmd/search-plan",
visibility = ["//visibility:private"],
deps = [
"//cmd/frontend/envvar",
"//internal/conf",
"//internal/search",
"//internal/search/client",
@ -14,7 +15,6 @@ go_library(
"//internal/search/job/jobutil",
"//internal/search/job/printer",
"//lib/errors",
"//schema",
"@com_github_sourcegraph_log//:log",
],
)

6
dev/internal/cmd/search-plan/search-plan.go
View File

@ -10,6 +10,7 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/search"
"github.com/sourcegraph/sourcegraph/internal/search/client"
@ -17,7 +18,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/job/jobutil"
"github.com/sourcegraph/sourcegraph/internal/search/job/printer"
"github.com/sourcegraph/sourcegraph/lib/errors"
"github.com/sourcegraph/sourcegraph/schema"
)
func run(w io.Writer, args []string) error {
@ -39,10 +39,10 @@ func run(w io.Writer, args []string) error {
if *smartSearch {
mode = search.SmartSearch
}
settings := &schema.Settings{}
// Sourcegraph infra we need
conf.Mock(&conf.Unified{})
envvar.MockSourcegraphDotComMode(*dotCom)
logger := log.Scoped("search-plan", "")
cli := client.MockedZoekt(logger, nil, nil)
@ -54,8 +54,6 @@ func run(w io.Writer, args []string) error {
query,
mode,
search.Streaming,
settings,
*dotCom,
)
if err != nil {
return errors.Wrap(err, "failed to plan")

1
enterprise/cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel generated
View File

@ -18,7 +18,6 @@ go_library(
"//internal/gqlutil",
"//internal/httpcli",
"//internal/search/job/jobutil",
"//internal/settings",
"//lib/errors",
"@com_github_graph_gophers_graphql_go//:graphql-go",
"@com_github_graph_gophers_graphql_go//relay",

15
enterprise/cmd/frontend/internal/codemonitors/resolvers/resolvers.go
View File

@ -20,7 +20,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/gqlutil"
"github.com/sourcegraph/sourcegraph/internal/httpcli"
"github.com/sourcegraph/sourcegraph/internal/search/job/jobutil"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/lib/errors"
)
@ -151,14 +150,9 @@ func (r *Resolver) CreateCodeMonitor(ctx context.Context, args *graphqlbackend.C
}
if featureflag.FromContext(ctx).GetBoolOr("cc-repo-aware-monitors", true) {
settings, err := settings.CurrentUserFinal(ctx, tx.db)
if err != nil {
return err
}
// Snapshot the state of the searched repos when the monitor is created so that
// we can distinguish new repos.
err = codemonitors.Snapshot(ctx, r.logger, tx.db, r.enterpriseJobs, args.Trigger.Query, m.ID, settings)
err = codemonitors.Snapshot(ctx, r.logger, tx.db, r.enterpriseJobs, args.Trigger.Query, m.ID)
if err != nil {
return err
}
@ -551,14 +545,9 @@ func (r *Resolver) updateCodeMonitor(ctx context.Context, args *graphqlbackend.U
// When the query is changed, take a new snapshot of the commits that currently
// exist so we know where to start.
if currentTrigger.QueryString != args.Trigger.Update.Query {
settings, err := settings.CurrentUserFinal(ctx, r.db)
if err != nil {
return nil, err
}
// Snapshot the state of the searched repos when the monitor is created so that
// we can distinguish new repos.
err = codemonitors.Snapshot(ctx, r.logger, r.db, r.enterpriseJobs, args.Trigger.Update.Query, monitorID, settings)
err = codemonitors.Snapshot(ctx, r.logger, r.db, r.enterpriseJobs, args.Trigger.Update.Query, monitorID)
if err != nil {
return nil, err
}

2
enterprise/cmd/frontend/internal/compute/streaming/BUILD.bazel generated
View File

@ -10,7 +10,6 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute/streaming",
visibility = ["//enterprise/cmd/frontend:__subpackages__"],
deps = [
"//cmd/frontend/envvar",
"//enterprise/internal/compute",
"//internal/conf",
"//internal/database",
@ -21,7 +20,6 @@ go_library(
"//internal/search/streaming",
"//internal/search/streaming/client",
"//internal/search/streaming/http",
"//internal/settings",
"//internal/trace",
"//lib/errors",
"@com_github_sourcegraph_conc//stream",

11
enterprise/cmd/frontend/internal/compute/streaming/compute.go
View File

@ -6,7 +6,6 @@ import (
"github.com/sourcegraph/conc/stream"
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/enterprise/internal/compute"
"github.com/sourcegraph/sourcegraph/internal/database"
"github.com/sourcegraph/sourcegraph/internal/search"
@ -14,7 +13,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/job/jobutil"
"github.com/sourcegraph/sourcegraph/internal/search/result"
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
"github.com/sourcegraph/sourcegraph/internal/settings"
)
func toComputeResult(ctx context.Context, cmd compute.Command, match result.Match) (out []compute.Result, _ error) {
@ -67,13 +65,6 @@ func NewComputeStream(ctx context.Context, logger log.Logger, db database.DB, en
}
})
settings, err := settings.CurrentUserFinal(ctx, db)
if err != nil {
close(eventsC)
close(errorC)
return eventsC, func() (*search.Alert, error) { return nil, err }
}
patternType := "regexp"
searchClient := client.New(logger, db, enterpriseJobs)
inputs, err := searchClient.Plan(
@ -83,8 +74,6 @@ func NewComputeStream(ctx context.Context, logger log.Logger, db database.DB, en
searchQuery,
search.Precise,
search.Streaming,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
close(eventsC)

2
enterprise/cmd/frontend/internal/context/resolvers/context_test.go
View File

@ -91,7 +91,7 @@ func TestContextResolver(t *testing.T) {
}
mockSearchClient := client.NewMockSearchClient()
mockSearchClient.PlanFunc.SetDefaultHook(func(_ context.Context, _ string, _ *string, query string, _ search.Mode, _ search.Protocol, _ *schema.Settings, _ bool) (*search.Inputs, error) {
mockSearchClient.PlanFunc.SetDefaultHook(func(_ context.Context, _ string, _ *string, query string, _ search.Mode, _ search.Protocol) (*search.Inputs, error) {
return &search.Inputs{OriginalQuery: query}, nil
})
mockSearchClient.ExecuteFunc.SetDefaultHook(func(_ context.Context, stream streaming.Sender, inputs *search.Inputs) (*search.Alert, error) {

3
enterprise/cmd/frontend/internal/guardrails/BUILD.bazel generated
View File

@ -7,7 +7,6 @@ go_library(
visibility = ["//enterprise/cmd/frontend:__subpackages__"],
deps = [
"//cmd/frontend/enterprise",
"//cmd/frontend/envvar",
"//enterprise/cmd/frontend/internal/guardrails/attribution",
"//enterprise/cmd/frontend/internal/guardrails/resolvers",
"//enterprise/internal/codeintel",
@ -15,7 +14,5 @@ go_library(
"//internal/database",
"//internal/observation",
"//internal/search/client",
"//internal/settings",
"//schema",
],
)

1
enterprise/cmd/frontend/internal/guardrails/attribution/BUILD.bazel generated
View File

@ -11,6 +11,5 @@ go_library(
"//internal/search/client",
"//internal/search/streaming",
"//lib/errors",
"//schema",
],
)

16
enterprise/cmd/frontend/internal/guardrails/attribution/attribution.go
View File

@ -10,22 +10,13 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/client"
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
"github.com/sourcegraph/sourcegraph/lib/errors"
"github.com/sourcegraph/sourcegraph/schema"
)
// Service is an attribution service which searches for matches on snippets of
// code.
type Service struct {
// CurrentUserFinal is settings.CurrentUserFinal without the DB parameter.
// This is temporary since we intend on moving the settings package into a
// service.
CurrentUserFinal func(context.Context) (*schema.Settings, error)
// SearchClient is used to find attribution on the local instance.
SearchClient client.SearchClient
// SourcegraphDotComMode is true if this instance is sourcegraph.com
SourcegraphDotComMode bool
}
// SnippetAttributions is holds the collection of attributions for a snippet.
@ -63,11 +54,6 @@ func (c *Service) SnippetAttribution(ctx context.Context, snippet string, limit
protocol = search.Batch
)
settings, err := c.CurrentUserFinal(ctx)
if err != nil {
return nil, errors.Wrap(err, "failed to get user settings")
}
patternType := "literal"
searchQuery := fmt.Sprintf("type:file select:repo index:only count:%d content:%q", limit, snippet)
@ -78,8 +64,6 @@ func (c *Service) SnippetAttribution(ctx context.Context, snippet string, limit
searchQuery,
searchMode,
protocol,
settings,
c.SourcegraphDotComMode,
)
if err != nil {
return nil, errors.Wrap(err, "failed to create search plan")

14
enterprise/cmd/frontend/internal/guardrails/init.go
View File

@ -4,7 +4,6 @@ import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/attribution"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/resolvers"
"github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel"
@ -12,8 +11,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/database"
"github.com/sourcegraph/sourcegraph/internal/observation"
"github.com/sourcegraph/sourcegraph/internal/search/client"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/schema"
)
func Init(
@ -25,9 +22,7 @@ func Init(
enterpriseServices *enterprise.Services,
) error {
attributionService := &attribution.Service{
CurrentUserFinal: settingsService(db),
SearchClient: client.New(observationCtx.Logger, db, enterpriseServices.EnterpriseSearchJobs),
SourcegraphDotComMode: envvar.SourcegraphDotComMode(),
SearchClient: client.New(observationCtx.Logger, db, enterpriseServices.EnterpriseSearchJobs),
}
enterpriseServices.GuardrailsResolver = &resolvers.GuardrailsResolver{
@ -36,10 +31,3 @@ func Init(
return nil
}
// settingsService is a temporary helper until we introduce a settings service.
func settingsService(db database.DB) func(context.Context) (*schema.Settings, error) {
return func(ctx context.Context) (*schema.Settings, error) {
return settings.CurrentUserFinal(ctx, db)
}
}

2
enterprise/internal/codemonitors/BUILD.bazel generated
View File

@ -7,7 +7,6 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/codemonitors",
visibility = ["//enterprise:__subpackages__"],
deps = [
"//cmd/frontend/envvar",
"//enterprise/internal/database",
"//internal/api",
"//internal/api/internalapi",
@ -23,7 +22,6 @@ go_library(
"//internal/search/result",
"//internal/search/streaming",
"//lib/errors",
"//schema",
"@com_github_sourcegraph_log//:log",
],
)

1
enterprise/internal/codemonitors/background/BUILD.bazel generated
View File

@ -35,7 +35,6 @@ go_library(
"//internal/observation",
"//internal/search/job/jobutil",
"//internal/search/result",
"//internal/settings",
"//internal/txemail",
"//internal/txemail/txtypes",
"//internal/types",

8
enterprise/internal/codemonitors/background/workers.go
View File

@ -19,7 +19,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/observation"
"github.com/sourcegraph/sourcegraph/internal/search/job/jobutil"
"github.com/sourcegraph/sourcegraph/internal/search/result"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/internal/workerutil"
"github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker"
dbworkerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store"
@ -183,12 +182,7 @@ func (r *queryRunner) Handle(ctx context.Context, logger log.Logger, triggerJob
ctx = actor.WithActor(ctx, actor.FromUser(m.UserID))
ctx = featureflag.WithFlags(ctx, r.db.FeatureFlags())
settings, err := settings.CurrentUserFinal(ctx, r.db)
if err != nil {
return errors.Wrap(err, "query settings")
}
results, searchErr := codemonitors.Search(ctx, logger, r.db, r.enterpriseJobs, q.QueryString, m.ID, settings)
results, searchErr := codemonitors.Search(ctx, logger, r.db, r.enterpriseJobs, q.QueryString, m.ID)
// Log next_run and latest_result to table cm_queries.
newLatestResult := latestResultTime(q.LatestResult, results, searchErr)

10
enterprise/internal/codemonitors/search.go
View File

@ -7,7 +7,6 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/api/internalapi"
@ -23,10 +22,9 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/result"
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
"github.com/sourcegraph/sourcegraph/lib/errors"
"github.com/sourcegraph/sourcegraph/schema"
)
func Search(ctx context.Context, logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJobs, query string, monitorID int64, settings *schema.Settings) (_ []*result.CommitMatch, err error) {
func Search(ctx context.Context, logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJobs, query string, monitorID int64) (_ []*result.CommitMatch, err error) {
searchClient := client.New(logger, db, enterpriseJobs)
inputs, err := searchClient.Plan(
ctx,
@ -35,8 +33,6 @@ func Search(ctx context.Context, logger log.Logger, db database.DB, enterpriseJo
query,
search.Precise,
search.Streaming,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
return nil, errcode.MakeNonRetryable(err)
@ -79,7 +75,7 @@ func Search(ctx context.Context, logger log.Logger, db database.DB, enterpriseJo
// Snapshot runs a dummy search that just saves the current state of the searched repos in the database.
// On subsequent runs, this allows us to treat all new repos or sets of args as something new that should
// be searched from the beginning.
func Snapshot(ctx context.Context, logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJobs, query string, monitorID int64, settings *schema.Settings) error {
func Snapshot(ctx context.Context, logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJobs, query string, monitorID int64) error {
searchClient := client.New(logger, db, enterpriseJobs)
inputs, err := searchClient.Plan(
ctx,
@ -88,8 +84,6 @@ func Snapshot(ctx context.Context, logger log.Logger, db database.DB, enterprise
query,
search.Precise,
search.Streaming,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
return err

2
enterprise/internal/codycontext/BUILD.bazel generated
View File

@ -6,7 +6,6 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/codycontext",
visibility = ["//enterprise:__subpackages__"],
deps = [
"//cmd/frontend/envvar",
"//enterprise/internal/database",
"//enterprise/internal/embeddings",
"//enterprise/internal/embeddings/embed",
@ -16,7 +15,6 @@ go_library(
"//internal/search/query",
"//internal/search/result",
"//internal/search/streaming",
"//internal/settings",
"//internal/types",
"@com_github_sourcegraph_conc//pool",
"@com_github_sourcegraph_log//:log",

9
enterprise/internal/codycontext/context.go
View File

@ -12,7 +12,6 @@ import (
"github.com/sourcegraph/conc/pool"
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database"
"github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings"
"github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed"
@ -22,7 +21,6 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/query"
"github.com/sourcegraph/sourcegraph/internal/search/result"
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/internal/types"
)
@ -179,11 +177,6 @@ func (c *CodyContextClient) getKeywordContext(ctx context.Context, args GetConte
return nil, nil
}
settings, err := settings.CurrentUserFinal(ctx, c.db)
if err != nil {
return nil, err
}
// mini-HACK: pass in the scope using repo: filters. In an ideal world, we
// would not be using query text manipulation for this and would be using
// the job structs directly.
@ -212,8 +205,6 @@ func (c *CodyContextClient) getKeywordContext(ctx context.Context, args GetConte
query,
search.Precise,
search.Streaming,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
return nil, err

2
enterprise/internal/insights/query/streaming/BUILD.bazel generated
View File

@ -10,7 +10,6 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/query/streaming",
visibility = ["//enterprise:__subpackages__"],
deps = [
"//cmd/frontend/envvar",
"//enterprise/internal/compute",
"//enterprise/internal/compute/client",
"//internal/api",
@ -23,7 +22,6 @@ go_library(
"//internal/search/streaming",
"//internal/search/streaming/api",
"//internal/search/streaming/http",
"//internal/settings",
"//internal/trace",
"//internal/types",
"@com_github_sourcegraph_log//:log",

8
enterprise/internal/insights/query/streaming/search_client.go
View File

@ -5,13 +5,11 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/internal/database"
"github.com/sourcegraph/sourcegraph/internal/search"
"github.com/sourcegraph/sourcegraph/internal/search/client"
"github.com/sourcegraph/sourcegraph/internal/search/job/jobutil"
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
"github.com/sourcegraph/sourcegraph/internal/settings"
)
type SearchClient interface {
@ -32,10 +30,6 @@ type insightsSearchClient struct {
}
func (r *insightsSearchClient) Search(ctx context.Context, query string, patternType *string, sender streaming.Sender) (*search.Alert, error) {
settings, err := settings.CurrentUserFinal(ctx, r.db)
if err != nil {
return nil, err
}
inputs, err := r.searchClient.Plan(
ctx,
"",
@ -43,8 +37,6 @@ func (r *insightsSearchClient) Search(ctx context.Context, query string, pattern
query,
search.Precise,
search.Streaming,
settings,
envvar.SourcegraphDotComMode(),
)
if err != nil {
return nil, err

2
internal/search/client/BUILD.bazel generated
View File

@ -10,6 +10,7 @@ go_library(
importpath = "github.com/sourcegraph/sourcegraph/internal/search/client",
visibility = ["//:__subpackages__"],
deps = [
"//cmd/frontend/envvar",
"//internal/actor",
"//internal/conf",
"//internal/database",
@ -23,6 +24,7 @@ go_library(
"//internal/search/query",
"//internal/search/searchcontexts",
"//internal/search/streaming",
"//internal/settings",
"//internal/trace",
"//lib/errors",
"//schema",

27
internal/search/client/client.go
View File

@ -11,6 +11,7 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/zoekt"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/database"
@ -24,6 +25,7 @@ import (
"github.com/sourcegraph/sourcegraph/internal/search/query"
"github.com/sourcegraph/sourcegraph/internal/search/searchcontexts"
"github.com/sourcegraph/sourcegraph/internal/search/streaming"
"github.com/sourcegraph/sourcegraph/internal/settings"
"github.com/sourcegraph/sourcegraph/internal/trace"
"github.com/sourcegraph/sourcegraph/lib/errors"
"github.com/sourcegraph/sourcegraph/schema"
@ -37,8 +39,6 @@ type SearchClient interface {
searchQuery string,
searchMode search.Mode,
protocol search.Protocol,
settings *schema.Settings,
sourcegraphDotComMode bool,
) (*search.Inputs, error)
Execute(
@ -58,6 +58,8 @@ func New(logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJob
zoekt: search.Indexed(),
searcherURLs: search.SearcherURLs(),
searcherGRPCConnectionCache: search.SearcherGRPCConnectionCache(),
settingsService: settings.NewService(db),
sourcegraphDotComMode: envvar.SourcegraphDotComMode(),
enterpriseJobs: enterpriseJobs,
}
}
@ -66,10 +68,12 @@ func New(logger log.Logger, db database.DB, enterpriseJobs jobutil.EnterpriseJob
// zoektStreamer.
func MockedZoekt(logger log.Logger, db database.DB, zoektStreamer zoekt.Streamer) SearchClient {
return &searchClient{
logger: logger,
db: db,
zoekt: zoektStreamer,
enterpriseJobs: jobutil.NewUnimplementedEnterpriseJobs(),
logger: logger,
db: db,
zoekt: zoektStreamer,
settingsService: settings.Mock(&schema.Settings{}),
sourcegraphDotComMode: envvar.SourcegraphDotComMode(),
enterpriseJobs: jobutil.NewUnimplementedEnterpriseJobs(),
}
}
@ -79,6 +83,8 @@ type searchClient struct {
zoekt zoekt.Streamer
searcherURLs *endpoint.Map
searcherGRPCConnectionCache *defaults.ConnectionCache
settingsService settings.Service
sourcegraphDotComMode bool
enterpriseJobs jobutil.EnterpriseJobs
}
@ -89,8 +95,6 @@ func (s *searchClient) Plan(
searchQuery string,
searchMode search.Mode,
protocol search.Protocol,
settings *schema.Settings,
sourcegraphDotComMode bool,
) (_ *search.Inputs, err error) {
tr, ctx := trace.New(ctx, "NewSearchInputs", searchQuery)
defer tr.FinishWithErr(&err)
@ -105,6 +109,11 @@ func (s *searchClient) Plan(
return nil, errors.New("Structural search is disabled in the site configuration.")
}
settings, err := s.settingsService.UserFromContext(ctx)
if err != nil {
return nil, errors.Wrap(err, "failed to resolve user settings")
}
// Beta: create a step to replace each context in the query with its repository query if any.
searchContextsQueryEnabled := settings.ExperimentalFeatures != nil && getBoolPtr(settings.ExperimentalFeatures.SearchContextsQuery, true)
substituteContextsStep := query.SubstituteSearchContexts(func(context string) (string, error) {
@ -132,7 +141,7 @@ func (s *searchClient) Plan(
OriginalQuery: searchQuery,
SearchMode: searchMode,
UserSettings: settings,
OnSourcegraphDotCom: sourcegraphDotComMode,
OnSourcegraphDotCom: s.sourcegraphDotComMode,
Features: ToFeatures(featureflag.FromContext(ctx), s.logger),
PatternType: searchType,
Protocol: protocol,

33
internal/search/client/mocks_temp.go
View File

@ -13,7 +13,6 @@ import (
search "github.com/sourcegraph/sourcegraph/internal/search"
job "github.com/sourcegraph/sourcegraph/internal/search/job"
streaming "github.com/sourcegraph/sourcegraph/internal/search/streaming"
schema "github.com/sourcegraph/sourcegraph/schema"
)
// MockSearchClient is a mock implementation of the SearchClient interface
@ -47,7 +46,7 @@ func NewMockSearchClient() *MockSearchClient {
},
},
PlanFunc: &SearchClientPlanFunc{
defaultHook: func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (r0 *search.Inputs, r1 error) {
defaultHook: func(context.Context, string, *string, string, search.Mode, search.Protocol) (r0 *search.Inputs, r1 error) {
return
},
},
@ -69,7 +68,7 @@ func NewStrictMockSearchClient() *MockSearchClient {
},
},
PlanFunc: &SearchClientPlanFunc{
defaultHook: func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error) {
defaultHook: func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error) {
panic("unexpected invocation of MockSearchClient.Plan")
},
},
@ -306,23 +305,23 @@ func (c SearchClientJobClientsFuncCall) Results() []interface{} {
// SearchClientPlanFunc describes the behavior when the Plan method of the
// parent MockSearchClient instance is invoked.
type SearchClientPlanFunc struct {
defaultHook func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error)
hooks []func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error)
defaultHook func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error)
hooks []func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error)
history []SearchClientPlanFuncCall
mutex sync.Mutex
}
// Plan delegates to the next hook function in the queue and stores the
// parameter and result values of this invocation.
func (m *MockSearchClient) Plan(v0 context.Context, v1 string, v2 *string, v3 string, v4 search.Mode, v5 search.Protocol, v6 *schema.Settings, v7 bool) (*search.Inputs, error) {
r0, r1 := m.PlanFunc.nextHook()(v0, v1, v2, v3, v4, v5, v6, v7)
m.PlanFunc.appendCall(SearchClientPlanFuncCall{v0, v1, v2, v3, v4, v5, v6, v7, r0, r1})
func (m *MockSearchClient) Plan(v0 context.Context, v1 string, v2 *string, v3 string, v4 search.Mode, v5 search.Protocol) (*search.Inputs, error) {
r0, r1 := m.PlanFunc.nextHook()(v0, v1, v2, v3, v4, v5)
m.PlanFunc.appendCall(SearchClientPlanFuncCall{v0, v1, v2, v3, v4, v5, r0, r1})
return r0, r1
}
// SetDefaultHook sets function that is called when the Plan method of the
// parent MockSearchClient instance is invoked and the hook queue is empty.
func (f *SearchClientPlanFunc) SetDefaultHook(hook func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error)) {
func (f *SearchClientPlanFunc) SetDefaultHook(hook func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error)) {
f.defaultHook = hook
}
@ -330,7 +329,7 @@ func (f *SearchClientPlanFunc) SetDefaultHook(hook func(context.Context, string,
// Plan method of the parent MockSearchClient instance invokes the hook at
// the front of the queue and discards it. After the queue is empty, the
// default hook function is invoked for any future action.
func (f *SearchClientPlanFunc) PushHook(hook func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error)) {
func (f *SearchClientPlanFunc) PushHook(hook func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error)) {
f.mutex.Lock()
f.hooks = append(f.hooks, hook)
f.mutex.Unlock()
@ -339,19 +338,19 @@ func (f *SearchClientPlanFunc) PushHook(hook func(context.Context, string, *stri
// SetDefaultReturn calls SetDefaultHook with a function that returns the
// given values.
func (f *SearchClientPlanFunc) SetDefaultReturn(r0 *search.Inputs, r1 error) {
f.SetDefaultHook(func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error) {
f.SetDefaultHook(func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error) {
return r0, r1
})
}
// PushReturn calls PushHook with a function that returns the given values.
func (f *SearchClientPlanFunc) PushReturn(r0 *search.Inputs, r1 error) {
f.PushHook(func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error) {
f.PushHook(func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error) {
return r0, r1
})
}
func (f *SearchClientPlanFunc) nextHook() func(context.Context, string, *string, string, search.Mode, search.Protocol, *schema.Settings, bool) (*search.Inputs, error) {
func (f *SearchClientPlanFunc) nextHook() func(context.Context, string, *string, string, search.Mode, search.Protocol) (*search.Inputs, error) {
f.mutex.Lock()
defer f.mutex.Unlock()
@ -402,12 +401,6 @@ type SearchClientPlanFuncCall struct {
// Arg5 is the value of the 6th argument passed to this method
// invocation.
Arg5 search.Protocol
// Arg6 is the value of the 7th argument passed to this method
// invocation.
Arg6 *schema.Settings
// Arg7 is the value of the 8th argument passed to this method
// invocation.
Arg7 bool
// Result0 is the value of the 1st result returned from this method
// invocation.
Result0 *search.Inputs
@ -419,7 +412,7 @@ type SearchClientPlanFuncCall struct {
// Args returns an interface slice containing the arguments of this
// invocation.
func (c SearchClientPlanFuncCall) Args() []interface{} {
return []interface{}{c.Arg0, c.Arg1, c.Arg2, c.Arg3, c.Arg4, c.Arg5, c.Arg6, c.Arg7}
return []interface{}{c.Arg0, c.Arg1, c.Arg2, c.Arg3, c.Arg4, c.Arg5}
}
// Results returns an interface slice containing the results of this