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.

Sign up for GitHub

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

remove deprecated ShardMaxImportantMatch TotalMaxImportantMatch #744

Merged
merged 2 commits into from
Feb 26, 2024
Merged

remove deprecated ShardMaxImportantMatch TotalMaxImportantMatch #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eab8ec
remove deprecated ShardMaxImportantMatch TotalMaxImportantMatch
keegancsmith Feb 25, 2024
542e356
pin go version in tests to 1.21
stefanhengl Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ name: CI
jobs:
test:
runs-on: ubuntu-latest
container: alpine:edge # go1.19 needs > alpine 3.15
# Pinned to alpine 3.19 to fix go version to 1.21. Remove this once Sourcegraph is on Go 1.22.
container: alpine:3.19
steps:
- name: checkout
uses: actions/checkout@v3
Expand Down
8 changes: 0 additions & 8 deletions api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,12 +892,6 @@ type SearchOptions struct {
// be set to 1 to find all repositories containing a result.
ShardRepoMaxMatchCount int

// Deprecated: this field is not read anymore.
ShardMaxImportantMatch int

// Deprecated: this field is not read anymore.
TotalMaxImportantMatch int

// Abort the search after this much time has passed.
MaxWallTime time.Duration

Expand Down Expand Up @@ -986,8 +980,6 @@ func (s *SearchOptions) String() string {
addInt("ShardMaxMatchCount", s.ShardMaxMatchCount)
addInt("TotalMaxMatchCount", s.TotalMaxMatchCount)
addInt("ShardRepoMaxMatchCount", s.ShardRepoMaxMatchCount)
addInt("ShardMaxImportantMatch", s.ShardMaxImportantMatch)
addInt("TotalMaxImportantMatch", s.TotalMaxImportantMatch)
addInt("MaxDocDisplayCount", s.MaxDocDisplayCount)
addInt("MaxMatchDisplayCount", s.MaxMatchDisplayCount)
addInt("NumContextLines", s.NumContextLines)
Expand Down
3 changes: 0 additions & 3 deletions api_proto_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,6 @@ func TestProtoRoundtrip(t *testing.T) {
t.Run("SearchOptions", func(t *testing.T) {
f := func(f1 *SearchOptions) bool {
if f1 != nil {
// Ignore deprecated and unimplemented fields
f1.ShardMaxImportantMatch = 0
f1.TotalMaxImportantMatch = 0
f1.SpanContext = nil
}
p1 := f1.ToProto()
Expand Down
Loading