diff --git a/internal/fulltext/bleve.go b/internal/fulltext/bleve.go index d1a7ea1be..b07c0e51d 100644 --- a/internal/fulltext/bleve.go +++ b/internal/fulltext/bleve.go @@ -67,13 +67,8 @@ func (f *Search) Close() error { return f.FulltextIndex.Close() } -// FulltextIndex indexes a given element -func (f *Search) Index(e IndexElement) error { - return f.FulltextIndex.Index(e.EventID, e) -} - -// BatchIndex indexes the given elements -func (f *Search) BatchIndex(elements []IndexElement) error { +// Index indexes the given elements +func (f *Search) Index(elements ...IndexElement) error { batch := f.FulltextIndex.NewBatch() for _, element := range elements { diff --git a/internal/fulltext/bleve_test.go b/internal/fulltext/bleve_test.go index a819733e0..b7f1cd909 100644 --- a/internal/fulltext/bleve_test.go +++ b/internal/fulltext/bleve_test.go @@ -81,7 +81,7 @@ func mustAddTestData(t *testing.T, fts *fulltext.Search, firstStreamPos int64) ( } e.SetContentType(gomatrixserverlib.MRoomTopic) batchItems = append(batchItems, e) - if err := fts.BatchIndex(batchItems); err != nil { + if err := fts.Index(batchItems...); err != nil { t.Fatalf("failed to batch insert elements: %v", err) } return eventIDs, roomIDs