Skip to content

Commit

Permalink
Rename IndexBuilder -> ShardBuilder (#908)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jtibshirani authored Feb 2, 2025
1 parent fc8c2bf commit 261aae3
Show file tree
Hide file tree
Showing 13 changed files with 208 additions and 208 deletions.
2 changes: 1 addition & 1 deletion cmd/zoekt-sourcegraph-indexserver/cleanup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func createTestShard(t *testing.T, repo string, id uint32, path string, optFns .
for _, optFn := range optFns {
optFn(r)
}
b, err := index.NewIndexBuilder(r)
b, err := index.NewShardBuilder(r)
if err != nil {
t.Fatal(err)
}
Expand Down
6 changes: 3 additions & 3 deletions index/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1020,13 +1020,13 @@ func (b *Builder) CheckMemoryUsage() {
}
}

func (b *Builder) newShardBuilder() (*IndexBuilder, error) {
func (b *Builder) newShardBuilder() (*ShardBuilder, error) {
desc := b.opts.RepositoryDescription
desc.HasSymbols = !b.opts.DisableCTags && b.opts.CTagsPath != ""
desc.SubRepoMap = b.opts.SubRepositories
desc.IndexOptions = b.opts.GetHash()

shardBuilder, err := NewIndexBuilder(&desc)
shardBuilder, err := NewShardBuilder(&desc)
if err != nil {
return nil, err
}
Expand All @@ -1035,7 +1035,7 @@ func (b *Builder) newShardBuilder() (*IndexBuilder, error) {
return shardBuilder, nil
}

func (b *Builder) writeShard(fn string, ib *IndexBuilder) (*finishedShard, error) {
func (b *Builder) writeShard(fn string, ib *ShardBuilder) (*finishedShard, error) {
dir := filepath.Dir(fn)
if err := os.MkdirAll(dir, 0o700); err != nil {
return nil, err
Expand Down
4 changes: 2 additions & 2 deletions index/eval_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func compoundReposShard(t *testing.T, names ...string) *indexData {
docs = append(docs, ds)
}

b := testIndexBuilderCompound(t, repos, docs)
b := testShardBuilderCompound(t, repos, docs)
s := searcherForTest(t, b)
return s.(*indexData)
}
Expand Down Expand Up @@ -375,7 +375,7 @@ func hash(name string) uint32 {

func TestGatherBranches(t *testing.T) {
content := []byte("dummy")
b := testIndexBuilder(t, &zoekt.Repository{
b := testShardBuilder(t, &zoekt.Repository{
Branches: []zoekt.RepositoryBranch{
{"foo", "v1"},
{"foo-2", "v1"},
Expand Down
Loading

0 comments on commit 261aae3

Please sign in to comment.