Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/jmoiron/sqlx v1.4.0
github.com/labstack/echo/v4 v4.15.0
github.com/mattn/go-colorable v0.1.14
github.com/meilisearch/meilisearch-go v0.34.2
github.com/meilisearch/meilisearch-go v0.35.1
github.com/mitchellh/mapstructure v1.5.0
github.com/prometheus/client_golang v1.23.2
github.com/redis/rueidis v1.0.70
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/maxatome/go-testdeep v1.14.0 h1:rRlLv1+kI8eOI3OaBXZwb3O7xY3exRzdW5QyX48g9wI=
github.com/maxatome/go-testdeep v1.14.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
github.com/meilisearch/meilisearch-go v0.34.2 h1:/OVQ2NQU3nRT5M/bhtg6pzxckxxGLy1hZyo3zjrja28=
github.com/meilisearch/meilisearch-go v0.34.2/go.mod h1:cUVJZ2zMqTvvwIMEEAdsWH+zrHsrLpAw6gm8Lt1MXK0=
github.com/meilisearch/meilisearch-go v0.35.1 h1:5H2FeY5eR4HSkaZMJIoefNzOj3XX1+5dd7ZfhAfzeMg=
github.com/meilisearch/meilisearch-go v0.35.1/go.mod h1:cUVJZ2zMqTvvwIMEEAdsWH+zrHsrLpAw6gm8Lt1MXK0=
github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA=
github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
Expand Down
7 changes: 4 additions & 3 deletions internal/search/character/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"strconv"

"github.com/meilisearch/meilisearch-go"
"github.com/samber/lo"
"github.com/trim21/errgo"

Expand All @@ -27,7 +28,7 @@ func (c *client) OnAdded(ctx context.Context, id model.CharacterID) error {

extracted := extract(&s)

_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, lo.ToPtr("id"))
_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})
return err
}

Expand All @@ -46,13 +47,13 @@ func (c *client) OnUpdate(ctx context.Context, id model.CharacterID) error {

extracted := extract(&s)

_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, lo.ToPtr("id"))
_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})

return err
}

func (c *client) OnDelete(ctx context.Context, id model.CharacterID) error {
_, err := c.index.DeleteDocumentWithContext(ctx, strconv.FormatUint(uint64(id), 10))
_, err := c.index.DeleteDocumentWithContext(ctx, strconv.FormatUint(uint64(id), 10), nil)

return errgo.Wrap(err, "search")
}
7 changes: 4 additions & 3 deletions internal/search/person/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"strconv"

"github.com/meilisearch/meilisearch-go"
"github.com/samber/lo"
"github.com/trim21/errgo"

Expand All @@ -27,7 +28,7 @@ func (c *client) OnAdded(ctx context.Context, id model.PersonID) error {

extracted := extract(&s)

_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, lo.ToPtr("id"))
_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})
return err
}

Expand All @@ -46,13 +47,13 @@ func (c *client) OnUpdate(ctx context.Context, id model.PersonID) error {

extracted := extract(&s)

_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, lo.ToPtr("id"))
_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})

return err
}

func (c *client) OnDelete(ctx context.Context, id model.PersonID) error {
_, err := c.index.DeleteDocumentWithContext(ctx, strconv.FormatUint(uint64(id), 10))
_, err := c.index.DeleteDocumentWithContext(ctx, strconv.FormatUint(uint64(id), 10), nil)

return errgo.Wrap(err, "search")
}
2 changes: 1 addition & 1 deletion internal/search/searcher/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func NewSendBatch(log *zap.Logger, index meilisearch.IndexManager) func([]Docume
return func(items []Document) {
log.Debug("send batch to meilisearch", zap.Int("len", len(items)))
err := retrier.Do(func() error {
_, err := index.UpdateDocuments(items, lo.ToPtr("id"))
_, err := index.UpdateDocuments(items, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})
return err
})
if err != nil {
Expand Down
7 changes: 4 additions & 3 deletions internal/search/subject/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"strconv"

"github.com/meilisearch/meilisearch-go"
"github.com/samber/lo"
"github.com/trim21/errgo"

Expand All @@ -28,7 +29,7 @@ func (c *client) OnAdded(ctx context.Context, id model.SubjectID) error {

extracted := extract(&s)

_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, lo.ToPtr("id"))
_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})
return err
}

Expand All @@ -47,13 +48,13 @@ func (c *client) OnUpdate(ctx context.Context, id model.SubjectID) error {

extracted := extract(&s)

_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, lo.ToPtr("id"))
_, err = c.index.UpdateDocumentsWithContext(ctx, extracted, &meilisearch.DocumentOptions{PrimaryKey: lo.ToPtr("id")})

return err
}

func (c *client) OnDelete(ctx context.Context, id model.SubjectID) error {
_, err := c.index.DeleteDocumentWithContext(ctx, strconv.FormatUint(uint64(id), 10))
_, err := c.index.DeleteDocumentWithContext(ctx, strconv.FormatUint(uint64(id), 10), nil)

return errgo.Wrap(err, "search")
}