Skip to content

Commit 261aae3

Browse files
authored
Rename IndexBuilder -> ShardBuilder (#908)
When navigating the code, I've often forgotten the difference between `NewBuilder` and `NewIndexBuilder`. This rename clarifies that one of these indexes a whole repo, while the other builds individual shards. Also `index.NewShardBuilder` sounds better.
1 parent fc8c2bf commit 261aae3

13 files changed

Lines changed: 208 additions & 208 deletions

File tree

cmd/zoekt-sourcegraph-indexserver/cleanup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func createTestShard(t *testing.T, repo string, id uint32, path string, optFns .
173173
for _, optFn := range optFns {
174174
optFn(r)
175175
}
176-
b, err := index.NewIndexBuilder(r)
176+
b, err := index.NewShardBuilder(r)
177177
if err != nil {
178178
t.Fatal(err)
179179
}

index/builder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,13 +1020,13 @@ func (b *Builder) CheckMemoryUsage() {
10201020
}
10211021
}
10221022

1023-
func (b *Builder) newShardBuilder() (*IndexBuilder, error) {
1023+
func (b *Builder) newShardBuilder() (*ShardBuilder, error) {
10241024
desc := b.opts.RepositoryDescription
10251025
desc.HasSymbols = !b.opts.DisableCTags && b.opts.CTagsPath != ""
10261026
desc.SubRepoMap = b.opts.SubRepositories
10271027
desc.IndexOptions = b.opts.GetHash()
10281028

1029-
shardBuilder, err := NewIndexBuilder(&desc)
1029+
shardBuilder, err := NewShardBuilder(&desc)
10301030
if err != nil {
10311031
return nil, err
10321032
}
@@ -1035,7 +1035,7 @@ func (b *Builder) newShardBuilder() (*IndexBuilder, error) {
10351035
return shardBuilder, nil
10361036
}
10371037

1038-
func (b *Builder) writeShard(fn string, ib *IndexBuilder) (*finishedShard, error) {
1038+
func (b *Builder) writeShard(fn string, ib *ShardBuilder) (*finishedShard, error) {
10391039
dir := filepath.Dir(fn)
10401040
if err := os.MkdirAll(dir, 0o700); err != nil {
10411041
return nil, err

index/eval_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func compoundReposShard(t *testing.T, names ...string) *indexData {
202202
docs = append(docs, ds)
203203
}
204204

205-
b := testIndexBuilderCompound(t, repos, docs)
205+
b := testShardBuilderCompound(t, repos, docs)
206206
s := searcherForTest(t, b)
207207
return s.(*indexData)
208208
}
@@ -375,7 +375,7 @@ func hash(name string) uint32 {
375375

376376
func TestGatherBranches(t *testing.T) {
377377
content := []byte("dummy")
378-
b := testIndexBuilder(t, &zoekt.Repository{
378+
b := testShardBuilder(t, &zoekt.Repository{
379379
Branches: []zoekt.RepositoryBranch{
380380
{"foo", "v1"},
381381
{"foo-2", "v1"},

0 commit comments

Comments
 (0)