Skip to content

Commit 47287ad

Browse files
jtibshiranijtibshirani
authored
Move shards package to root and rename to 'search' (#930)
In #901 I moved several packages to 'internal' to clean up the exported API. This PR moves the `shards` package back to root, since it contains important methods like `NewDirectorySearcher`. It also renames the `shards` package to `search` to clarify the usage. Relates to #901 (comment), #927
1 parent 5c1352c commit 47287ad

File tree

20 files changed

+46
-47
lines changed

20 files changed

+46
-47
lines changed

‎cmd/zoekt-merge-index/main_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"sort"
99
"testing"
1010

11+
"github.com/sourcegraph/zoekt/search"
1112
"github.com/stretchr/testify/require"
1213

1314
"github.com/sourcegraph/zoekt"
1415
"github.com/sourcegraph/zoekt/index"
15-
"github.com/sourcegraph/zoekt/internal/shards"
1616
"github.com/sourcegraph/zoekt/query"
1717
)
1818

@@ -32,7 +32,7 @@ func TestMerge(t *testing.T) {
3232
// stable
3333
require.Equal(t, filepath.Base(cs), "compound-ea9613e2ffba7d7361856aebfca75fb714856509_v17.00000.zoekt")
3434

35-
ss, err := shards.NewDirectorySearcher(dir)
35+
ss, err := search.NewDirectorySearcher(dir)
3636
require.NoError(t, err)
3737
defer ss.Close()
3838

@@ -81,7 +81,7 @@ func TestExplode(t *testing.T) {
8181
t.Fatalf("the number of simple shards before %d and after %d should be the same", len(testShards), len(exploded))
8282
}
8383

84-
ss, err := shards.NewDirectorySearcher(dir)
84+
ss, err := search.NewDirectorySearcher(dir)
8585
require.NoError(t, err)
8686
defer ss.Close()
8787

‎cmd/zoekt-test/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333

3434
"github.com/sourcegraph/zoekt"
3535
"github.com/sourcegraph/zoekt/index"
36-
"github.com/sourcegraph/zoekt/internal/shards"
3736
"github.com/sourcegraph/zoekt/query"
37+
"github.com/sourcegraph/zoekt/search"
3838
)
3939

4040
func readTree(dir string) (map[string][]byte, error) {
@@ -107,7 +107,7 @@ func compare(dir, patfile string, caseSensitive bool) error {
107107
if err != nil {
108108
return err
109109
}
110-
searcher, err := shards.NewDirectorySearcher(indexDir)
110+
searcher, err := search.NewDirectorySearcher(indexDir)
111111
if err != nil {
112112
return err
113113
}
@@ -179,7 +179,7 @@ func testLoadIndexDir(indexDir string) {
179179
runtime.GC()
180180
runtime.ReadMemStats(&a)
181181
start := time.Now()
182-
s, err := shards.NewDirectorySearcher(indexDir)
182+
s, err := search.NewDirectorySearcher(indexDir)
183183
if err != nil {
184184
return
185185
}

‎cmd/zoekt-webserver/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ import (
5656
"github.com/sourcegraph/zoekt/index"
5757
"github.com/sourcegraph/zoekt/internal/debugserver"
5858
"github.com/sourcegraph/zoekt/internal/profiler"
59-
"github.com/sourcegraph/zoekt/internal/shards"
6059
"github.com/sourcegraph/zoekt/internal/trace"
6160
"github.com/sourcegraph/zoekt/internal/tracer"
6261
"github.com/sourcegraph/zoekt/query"
62+
"github.com/sourcegraph/zoekt/search"
6363
"github.com/sourcegraph/zoekt/web"
6464
)
6565

@@ -203,7 +203,7 @@ func main() {
203203
// Do not block on loading shards so we can become partially available
204204
// sooner. Otherwise on large instances zoekt can be unavailable on the
205205
// order of minutes.
206-
searcher, err := shards.NewDirectorySearcherFast(*indexDir)
206+
searcher, err := search.NewDirectorySearcherFast(*indexDir)
207207
if err != nil {
208208
log.Fatal(err)
209209
}

‎cmd/zoekt/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"github.com/felixge/fgprof"
3232
"github.com/sourcegraph/zoekt"
3333
"github.com/sourcegraph/zoekt/index"
34-
"github.com/sourcegraph/zoekt/internal/shards"
3534
"github.com/sourcegraph/zoekt/query"
35+
"github.com/sourcegraph/zoekt/search"
3636
)
3737

3838
func displayMatches(files []zoekt.FileMatch, pat string, withRepo bool, list bool) {
@@ -191,7 +191,7 @@ func main() {
191191
if *shard != "" {
192192
searcher, err = loadShard(*shard, *verbose)
193193
} else {
194-
searcher, err = shards.NewDirectorySearcher(*index)
194+
searcher, err = search.NewDirectorySearcher(*index)
195195
}
196196

197197
if err != nil {

‎internal/archive/e2e_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
"github.com/sourcegraph/zoekt"
2020
"github.com/sourcegraph/zoekt/index"
21-
"github.com/sourcegraph/zoekt/internal/shards"
2221
"github.com/sourcegraph/zoekt/query"
22+
"github.com/sourcegraph/zoekt/search"
2323
"github.com/stretchr/testify/require"
2424
)
2525

@@ -178,7 +178,7 @@ func testIndexIncrementally(t *testing.T, format string) {
178178
t.Fatalf("error creating index: %v", err)
179179
}
180180

181-
ss, err := shards.NewDirectorySearcher(indexDir)
181+
ss, err := search.NewDirectorySearcher(indexDir)
182182
if err != nil {
183183
t.Fatalf("NewDirectorySearcher(%s): %v", indexDir, err)
184184
}

‎internal/e2e/e2e_index_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434
"github.com/grafana/regexp"
3535
"github.com/sourcegraph/zoekt"
3636
"github.com/sourcegraph/zoekt/index"
37-
"github.com/sourcegraph/zoekt/internal/shards"
3837
"github.com/sourcegraph/zoekt/internal/tenant"
3938
"github.com/sourcegraph/zoekt/internal/tenant/tenanttest"
4039
"github.com/sourcegraph/zoekt/query"
40+
"github.com/sourcegraph/zoekt/search"
4141
"github.com/stretchr/testify/require"
4242
)
4343

@@ -92,7 +92,7 @@ func TestBasicIndexing(t *testing.T) {
9292
}
9393
}
9494

95-
ss, err := shards.NewDirectorySearcher(dir)
95+
ss, err := search.NewDirectorySearcher(dir)
9696
if err != nil {
9797
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
9898
}
@@ -215,7 +215,7 @@ func TestSearchTenant(t *testing.T) {
215215
}
216216
}
217217

218-
ss, err := shards.NewDirectorySearcher(dir)
218+
ss, err := search.NewDirectorySearcher(dir)
219219
if err != nil {
220220
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
221221
}
@@ -271,7 +271,7 @@ func TestListTenant(t *testing.T) {
271271
t.Fatalf("want a shard, got %v", fs)
272272
}
273273

274-
ss, err := shards.NewDirectorySearcher(dir)
274+
ss, err := search.NewDirectorySearcher(dir)
275275
if err != nil {
276276
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
277277
}
@@ -359,7 +359,7 @@ func TestLargeFileOption(t *testing.T) {
359359
t.Errorf("Finish: %v", err)
360360
}
361361

362-
ss, err := shards.NewDirectorySearcher(dir)
362+
ss, err := search.NewDirectorySearcher(dir)
363363
if err != nil {
364364
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
365365
}
@@ -406,7 +406,7 @@ func TestUpdate(t *testing.T) {
406406
t.Errorf("Finish: %v", err)
407407
}
408408
}
409-
ss, err := shards.NewDirectorySearcher(dir)
409+
ss, err := search.NewDirectorySearcher(dir)
410410
if err != nil {
411411
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
412412
}
@@ -582,7 +582,7 @@ func TestEmptyContent(t *testing.T) {
582582
t.Fatalf("want a shard, got %v", fs)
583583
}
584584

585-
ss, err := shards.NewDirectorySearcher(dir)
585+
ss, err := search.NewDirectorySearcher(dir)
586586
if err != nil {
587587
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
588588
}
@@ -767,7 +767,7 @@ func TestDeltaShards(t *testing.T) {
767767
t.Errorf("unexpected diff in index state (-want +got):\n%s", diff)
768768
}
769769

770-
ss, err := shards.NewDirectorySearcher(indexDir)
770+
ss, err := search.NewDirectorySearcher(indexDir)
771771
if err != nil {
772772
t.Fatalf("step %q: NewDirectorySearcher(%s): %s", step.name, indexDir, err)
773773
}

‎internal/e2e/e2e_rank_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/sourcegraph/zoekt"
1919
"github.com/sourcegraph/zoekt/index"
2020
"github.com/sourcegraph/zoekt/internal/archive"
21-
"github.com/sourcegraph/zoekt/internal/shards"
2221
"github.com/sourcegraph/zoekt/query"
22+
"github.com/sourcegraph/zoekt/search"
2323
)
2424

2525
var update = flag.Bool("update", false, "update golden file")
@@ -96,7 +96,7 @@ func TestRanking(t *testing.T) {
9696
}
9797
}
9898

99-
ss, err := shards.NewDirectorySearcher(indexDir)
99+
ss, err := search.NewDirectorySearcher(indexDir)
100100
if err != nil {
101101
t.Fatalf("NewDirectorySearcher(%s): %v", indexDir, err)
102102
}

‎internal/e2e/scoring_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/sourcegraph/zoekt"
2424
"github.com/sourcegraph/zoekt/index"
2525
"github.com/sourcegraph/zoekt/internal/ctags"
26-
"github.com/sourcegraph/zoekt/internal/shards"
2726
"github.com/sourcegraph/zoekt/query"
27+
"github.com/sourcegraph/zoekt/search"
2828
)
2929

3030
type scoreCase struct {
@@ -709,7 +709,7 @@ func checkScoring(t *testing.T, c scoreCase, useBM25 bool, parserType ctags.CTag
709709
t.Fatalf("Finish: %v", err)
710710
}
711711

712-
ss, err := shards.NewDirectorySearcher(dir)
712+
ss, err := search.NewDirectorySearcher(dir)
713713
if err != nil {
714714
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
715715
}
@@ -818,7 +818,7 @@ func TestRepoRanks(t *testing.T) {
818818
t.Fatalf("Finish: %v", err)
819819
}
820820

821-
ss, err := shards.NewDirectorySearcher(dir)
821+
ss, err := search.NewDirectorySearcher(dir)
822822
if err != nil {
823823
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
824824
}

‎internal/gitindex/ignore_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"github.com/sourcegraph/zoekt"
1313
"github.com/sourcegraph/zoekt/index"
14-
"github.com/sourcegraph/zoekt/internal/shards"
1514
"github.com/sourcegraph/zoekt/query"
15+
"github.com/sourcegraph/zoekt/search"
1616
)
1717

1818
func createSourcegraphignoreRepo(dir string) error {
@@ -76,7 +76,7 @@ func TestIgnore(t *testing.T) {
7676
t.Fatalf("IndexGitRepo: %v", err)
7777
}
7878

79-
searcher, err := shards.NewDirectorySearcher(indexDir)
79+
searcher, err := search.NewDirectorySearcher(indexDir)
8080
if err != nil {
8181
t.Fatal("NewDirectorySearcher", err)
8282
}

‎internal/gitindex/index_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"github.com/sourcegraph/zoekt"
3636
"github.com/sourcegraph/zoekt/ignore"
3737
"github.com/sourcegraph/zoekt/index"
38-
"github.com/sourcegraph/zoekt/internal/shards"
3938
"github.com/sourcegraph/zoekt/query"
39+
"github.com/sourcegraph/zoekt/search"
4040
)
4141

4242
func TestIndexEmptyRepo(t *testing.T) {
@@ -116,7 +116,7 @@ func TestIndexTinyRepo(t *testing.T) {
116116
t.Fatalf("unexpected error %v", err)
117117
}
118118

119-
searcher, err := shards.NewDirectorySearcher(dir)
119+
searcher, err := search.NewDirectorySearcher(dir)
120120
if err != nil {
121121
t.Fatal("NewDirectorySearcher", err)
122122
}
@@ -724,7 +724,7 @@ func TestIndexDeltaBasic(t *testing.T) {
724724
//
725725
// then, compare returned set of documents with the expected set for the step and see if they agree
726726

727-
ss, err := shards.NewDirectorySearcher(indexDir)
727+
ss, err := search.NewDirectorySearcher(indexDir)
728728
if err != nil {
729729
t.Fatalf("NewDirectorySearcher(%s): %s", indexDir, err)
730730
}

0 commit comments

Comments
 (0)