fork of https://github.com/sourcegraph/zoekt
Move shards package to root and rename to 'search' (#930)
In https://github.com/sourcegraph/zoekt/pull/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 https://github.com/sourcegraph/zoekt/pull/901#issuecomment-2703171432, https://github.com/sourcegraph/zoekt/discussions/927
author
Julie Tibshirani
committer
GitHub
date
(Mar 25, 2025, 9:34 AM -0700)
commit
47287ade
47287adecfbd6b068cf7ad5fb67c9548a7062156
parent
5c1352c1
5c1352c15efb3fd226d314ea8347d000de98dc0c
+46
-47
+3
-3
cmd/zoekt-merge-index/main_test.go
+3
-3
cmd/zoekt-merge-index/main_test.go
···
8
8
"sort"
9
9
"testing"
10
10
11
+
"github.com/sourcegraph/zoekt/search"
11
12
"github.com/stretchr/testify/require"
12
13
13
14
"github.com/sourcegraph/zoekt"
14
15
"github.com/sourcegraph/zoekt/index"
15
-
"github.com/sourcegraph/zoekt/internal/shards"
16
16
"github.com/sourcegraph/zoekt/query"
17
17
)
18
18
···
32
32
// stable
33
33
require.Equal(t, filepath.Base(cs), "compound-ea9613e2ffba7d7361856aebfca75fb714856509_v17.00000.zoekt")
34
34
35
-
ss, err := shards.NewDirectorySearcher(dir)
35
+
ss, err := search.NewDirectorySearcher(dir)
36
36
require.NoError(t, err)
37
37
defer ss.Close()
38
38
···
81
81
t.Fatalf("the number of simple shards before %d and after %d should be the same", len(testShards), len(exploded))
82
82
}
83
83
84
-
ss, err := shards.NewDirectorySearcher(dir)
84
+
ss, err := search.NewDirectorySearcher(dir)
85
85
require.NoError(t, err)
86
86
defer ss.Close()
87
87
+3
-3
cmd/zoekt-test/main.go
+3
-3
cmd/zoekt-test/main.go
···
33
33
34
34
"github.com/sourcegraph/zoekt"
35
35
"github.com/sourcegraph/zoekt/index"
36
-
"github.com/sourcegraph/zoekt/internal/shards"
37
36
"github.com/sourcegraph/zoekt/query"
37
+
"github.com/sourcegraph/zoekt/search"
38
38
)
39
39
40
40
func readTree(dir string) (map[string][]byte, error) {
···
107
107
if err != nil {
108
108
return err
109
109
}
110
-
searcher, err := shards.NewDirectorySearcher(indexDir)
110
+
searcher, err := search.NewDirectorySearcher(indexDir)
111
111
if err != nil {
112
112
return err
113
113
}
···
179
179
runtime.GC()
180
180
runtime.ReadMemStats(&a)
181
181
start := time.Now()
182
-
s, err := shards.NewDirectorySearcher(indexDir)
182
+
s, err := search.NewDirectorySearcher(indexDir)
183
183
if err != nil {
184
184
return
185
185
}
+2
-2
cmd/zoekt-webserver/main.go
+2
-2
cmd/zoekt-webserver/main.go
···
56
56
"github.com/sourcegraph/zoekt/index"
57
57
"github.com/sourcegraph/zoekt/internal/debugserver"
58
58
"github.com/sourcegraph/zoekt/internal/profiler"
59
-
"github.com/sourcegraph/zoekt/internal/shards"
60
59
"github.com/sourcegraph/zoekt/internal/trace"
61
60
"github.com/sourcegraph/zoekt/internal/tracer"
62
61
"github.com/sourcegraph/zoekt/query"
62
+
"github.com/sourcegraph/zoekt/search"
63
63
"github.com/sourcegraph/zoekt/web"
64
64
)
65
65
···
203
203
// Do not block on loading shards so we can become partially available
204
204
// sooner. Otherwise on large instances zoekt can be unavailable on the
205
205
// order of minutes.
206
-
searcher, err := shards.NewDirectorySearcherFast(*indexDir)
206
+
searcher, err := search.NewDirectorySearcherFast(*indexDir)
207
207
if err != nil {
208
208
log.Fatal(err)
209
209
}
+2
-2
cmd/zoekt/main.go
+2
-2
cmd/zoekt/main.go
···
31
31
"github.com/felixge/fgprof"
32
32
"github.com/sourcegraph/zoekt"
33
33
"github.com/sourcegraph/zoekt/index"
34
-
"github.com/sourcegraph/zoekt/internal/shards"
35
34
"github.com/sourcegraph/zoekt/query"
35
+
"github.com/sourcegraph/zoekt/search"
36
36
)
37
37
38
38
func displayMatches(files []zoekt.FileMatch, pat string, withRepo bool, list bool) {
···
191
191
if *shard != "" {
192
192
searcher, err = loadShard(*shard, *verbose)
193
193
} else {
194
-
searcher, err = shards.NewDirectorySearcher(*index)
194
+
searcher, err = search.NewDirectorySearcher(*index)
195
195
}
196
196
197
197
if err != nil {
+2
-2
internal/archive/e2e_test.go
+2
-2
internal/archive/e2e_test.go
···
18
18
19
19
"github.com/sourcegraph/zoekt"
20
20
"github.com/sourcegraph/zoekt/index"
21
-
"github.com/sourcegraph/zoekt/internal/shards"
22
21
"github.com/sourcegraph/zoekt/query"
22
+
"github.com/sourcegraph/zoekt/search"
23
23
"github.com/stretchr/testify/require"
24
24
)
25
25
···
178
178
t.Fatalf("error creating index: %v", err)
179
179
}
180
180
181
-
ss, err := shards.NewDirectorySearcher(indexDir)
181
+
ss, err := search.NewDirectorySearcher(indexDir)
182
182
if err != nil {
183
183
t.Fatalf("NewDirectorySearcher(%s): %v", indexDir, err)
184
184
}
+8
-8
internal/e2e/e2e_index_test.go
+8
-8
internal/e2e/e2e_index_test.go
···
34
34
"github.com/grafana/regexp"
35
35
"github.com/sourcegraph/zoekt"
36
36
"github.com/sourcegraph/zoekt/index"
37
-
"github.com/sourcegraph/zoekt/internal/shards"
38
37
"github.com/sourcegraph/zoekt/internal/tenant"
39
38
"github.com/sourcegraph/zoekt/internal/tenant/tenanttest"
40
39
"github.com/sourcegraph/zoekt/query"
40
+
"github.com/sourcegraph/zoekt/search"
41
41
"github.com/stretchr/testify/require"
42
42
)
43
43
···
92
92
}
93
93
}
94
94
95
-
ss, err := shards.NewDirectorySearcher(dir)
95
+
ss, err := search.NewDirectorySearcher(dir)
96
96
if err != nil {
97
97
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
98
98
}
···
215
215
}
216
216
}
217
217
218
-
ss, err := shards.NewDirectorySearcher(dir)
218
+
ss, err := search.NewDirectorySearcher(dir)
219
219
if err != nil {
220
220
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
221
221
}
···
271
271
t.Fatalf("want a shard, got %v", fs)
272
272
}
273
273
274
-
ss, err := shards.NewDirectorySearcher(dir)
274
+
ss, err := search.NewDirectorySearcher(dir)
275
275
if err != nil {
276
276
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
277
277
}
···
359
359
t.Errorf("Finish: %v", err)
360
360
}
361
361
362
-
ss, err := shards.NewDirectorySearcher(dir)
362
+
ss, err := search.NewDirectorySearcher(dir)
363
363
if err != nil {
364
364
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
365
365
}
···
406
406
t.Errorf("Finish: %v", err)
407
407
}
408
408
}
409
-
ss, err := shards.NewDirectorySearcher(dir)
409
+
ss, err := search.NewDirectorySearcher(dir)
410
410
if err != nil {
411
411
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
412
412
}
···
582
582
t.Fatalf("want a shard, got %v", fs)
583
583
}
584
584
585
-
ss, err := shards.NewDirectorySearcher(dir)
585
+
ss, err := search.NewDirectorySearcher(dir)
586
586
if err != nil {
587
587
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
588
588
}
···
767
767
t.Errorf("unexpected diff in index state (-want +got):\n%s", diff)
768
768
}
769
769
770
-
ss, err := shards.NewDirectorySearcher(indexDir)
770
+
ss, err := search.NewDirectorySearcher(indexDir)
771
771
if err != nil {
772
772
t.Fatalf("step %q: NewDirectorySearcher(%s): %s", step.name, indexDir, err)
773
773
}
+2
-2
internal/e2e/e2e_rank_test.go
+2
-2
internal/e2e/e2e_rank_test.go
···
18
18
"github.com/sourcegraph/zoekt"
19
19
"github.com/sourcegraph/zoekt/index"
20
20
"github.com/sourcegraph/zoekt/internal/archive"
21
-
"github.com/sourcegraph/zoekt/internal/shards"
22
21
"github.com/sourcegraph/zoekt/query"
22
+
"github.com/sourcegraph/zoekt/search"
23
23
)
24
24
25
25
var update = flag.Bool("update", false, "update golden file")
···
96
96
}
97
97
}
98
98
99
-
ss, err := shards.NewDirectorySearcher(indexDir)
99
+
ss, err := search.NewDirectorySearcher(indexDir)
100
100
if err != nil {
101
101
t.Fatalf("NewDirectorySearcher(%s): %v", indexDir, err)
102
102
}
+3
-3
internal/e2e/scoring_test.go
+3
-3
internal/e2e/scoring_test.go
···
23
23
"github.com/sourcegraph/zoekt"
24
24
"github.com/sourcegraph/zoekt/index"
25
25
"github.com/sourcegraph/zoekt/internal/ctags"
26
-
"github.com/sourcegraph/zoekt/internal/shards"
27
26
"github.com/sourcegraph/zoekt/query"
27
+
"github.com/sourcegraph/zoekt/search"
28
28
)
29
29
30
30
type scoreCase struct {
···
709
709
t.Fatalf("Finish: %v", err)
710
710
}
711
711
712
-
ss, err := shards.NewDirectorySearcher(dir)
712
+
ss, err := search.NewDirectorySearcher(dir)
713
713
if err != nil {
714
714
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
715
715
}
···
818
818
t.Fatalf("Finish: %v", err)
819
819
}
820
820
821
-
ss, err := shards.NewDirectorySearcher(dir)
821
+
ss, err := search.NewDirectorySearcher(dir)
822
822
if err != nil {
823
823
t.Fatalf("NewDirectorySearcher(%s): %v", dir, err)
824
824
}
+2
-2
internal/gitindex/ignore_test.go
+2
-2
internal/gitindex/ignore_test.go
···
11
11
12
12
"github.com/sourcegraph/zoekt"
13
13
"github.com/sourcegraph/zoekt/index"
14
-
"github.com/sourcegraph/zoekt/internal/shards"
15
14
"github.com/sourcegraph/zoekt/query"
15
+
"github.com/sourcegraph/zoekt/search"
16
16
)
17
17
18
18
func createSourcegraphignoreRepo(dir string) error {
···
76
76
t.Fatalf("IndexGitRepo: %v", err)
77
77
}
78
78
79
-
searcher, err := shards.NewDirectorySearcher(indexDir)
79
+
searcher, err := search.NewDirectorySearcher(indexDir)
80
80
if err != nil {
81
81
t.Fatal("NewDirectorySearcher", err)
82
82
}
+3
-3
internal/gitindex/index_test.go
+3
-3
internal/gitindex/index_test.go
···
35
35
"github.com/sourcegraph/zoekt"
36
36
"github.com/sourcegraph/zoekt/ignore"
37
37
"github.com/sourcegraph/zoekt/index"
38
-
"github.com/sourcegraph/zoekt/internal/shards"
39
38
"github.com/sourcegraph/zoekt/query"
39
+
"github.com/sourcegraph/zoekt/search"
40
40
)
41
41
42
42
func TestIndexEmptyRepo(t *testing.T) {
···
116
116
t.Fatalf("unexpected error %v", err)
117
117
}
118
118
119
-
searcher, err := shards.NewDirectorySearcher(dir)
119
+
searcher, err := search.NewDirectorySearcher(dir)
120
120
if err != nil {
121
121
t.Fatal("NewDirectorySearcher", err)
122
122
}
···
724
724
//
725
725
// then, compare returned set of documents with the expected set for the step and see if they agree
726
726
727
-
ss, err := shards.NewDirectorySearcher(indexDir)
727
+
ss, err := search.NewDirectorySearcher(indexDir)
728
728
if err != nil {
729
729
t.Fatalf("NewDirectorySearcher(%s): %s", indexDir, err)
730
730
}
+6
-6
internal/gitindex/tree_test.go
+6
-6
internal/gitindex/tree_test.go
···
32
32
"github.com/sourcegraph/zoekt"
33
33
"github.com/sourcegraph/zoekt/ignore"
34
34
"github.com/sourcegraph/zoekt/index"
35
-
"github.com/sourcegraph/zoekt/internal/shards"
36
35
"github.com/sourcegraph/zoekt/query"
36
+
"github.com/sourcegraph/zoekt/search"
37
37
)
38
38
39
39
func createSubmoduleRepo(dir string) error {
···
218
218
t.Fatalf("IndexGitRepo: %v", err)
219
219
}
220
220
221
-
searcher, err := shards.NewDirectorySearcher(indexDir)
221
+
searcher, err := search.NewDirectorySearcher(indexDir)
222
222
if err != nil {
223
223
t.Fatal("NewDirectorySearcher", err)
224
224
}
···
322
322
t.Fatalf("IndexGitRepo: %v", err)
323
323
}
324
324
325
-
searcher, err := shards.NewDirectorySearcher(indexDir)
325
+
searcher, err := search.NewDirectorySearcher(indexDir)
326
326
if err != nil {
327
327
t.Fatal("NewDirectorySearcher", err)
328
328
}
···
449
449
t.Fatalf("IndexGitRepo: %v", err)
450
450
}
451
451
452
-
searcher, err := shards.NewDirectorySearcher(indexDir)
452
+
searcher, err := search.NewDirectorySearcher(indexDir)
453
453
if err != nil {
454
454
t.Fatal("NewDirectorySearcher", err)
455
455
}
···
528
528
t.Fatalf("IndexGitRepo: %v", err)
529
529
}
530
530
531
-
searcher, err := shards.NewDirectorySearcher(indexDir)
531
+
searcher, err := search.NewDirectorySearcher(indexDir)
532
532
if err != nil {
533
533
t.Fatal("NewDirectorySearcher", err)
534
534
}
···
578
578
t.Fatalf("IndexGitRepo: %v", err)
579
579
}
580
580
581
-
searcher, err := shards.NewDirectorySearcher(indexDir)
581
+
searcher, err := search.NewDirectorySearcher(indexDir)
582
582
if err != nil {
583
583
t.Fatal("NewDirectorySearcher", err)
584
584
}
+2
-3
internal/shards/aggregate.go
search/aggregate.go
+2
-3
internal/shards/aggregate.go
search/aggregate.go
+1
-1
internal/shards/eval.go
search/eval.go
+1
-1
internal/shards/eval.go
search/eval.go
+1
-1
internal/shards/eval_test.go
search/eval_test.go
+1
-1
internal/shards/eval_test.go
search/eval_test.go
+1
-1
internal/shards/sched.go
search/sched.go
+1
-1
internal/shards/sched.go
search/sched.go
+1
-1
internal/shards/sched_test.go
search/sched_test.go
+1
-1
internal/shards/sched_test.go
search/sched_test.go
+1
-1
internal/shards/shards.go
search/shards.go
+1
-1
internal/shards/shards.go
search/shards.go
+1
-1
internal/shards/shards_test.go
search/shards_test.go
+1
-1
internal/shards/shards_test.go
search/shards_test.go
+1
-1
internal/shards/watcher.go
search/watcher.go
+1
-1
internal/shards/watcher.go
search/watcher.go