Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring back v1.7.1 into main #4502

Merged
merged 5 commits into from
Mar 19, 2024
Merged

Bring back v1.7.1 into main #4502

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca4876f
Do not reindex when modifying unknown faceted field
Kerollmops Mar 12, 2024
7f3c495
Update version for the next release (v1.7.1) in Cargo.toml
Kerollmops Mar 13, 2024
1d8c13f
Merge #4487
meili-bors[bot] Mar 13, 2024
d2f77e8
Merge #4479
meili-bors[bot] Mar 13, 2024
bd74cce
Merge remote-tracking branch 'origin/main' into release-v1.7.1
Kerollmops Mar 19, 2024
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
10 changes: 9 additions & 1 deletion milli/src/update/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,13 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> {
{
self.index.set_updated_at(self.wtxn, &OffsetDateTime::now_utc())?;

let existing_fields: HashSet<_> = self
.index
.field_distribution(self.wtxn)?
.into_iter()
.filter_map(|(field, count)| (count != 0).then_some(field))
.collect();

let old_faceted_fields = self.index.user_defined_faceted_fields(self.wtxn)?;
let old_fields_ids_map = self.index.fields_ids_map(self.wtxn)?;

Expand All @@ -1053,7 +1060,8 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> {
// index new fields as facets. It means that the distinct attribute,
// an Asc/Desc criterion or a filtered attribute as be added or removed.
let new_faceted_fields = self.index.user_defined_faceted_fields(self.wtxn)?;
let faceted_updated = old_faceted_fields != new_faceted_fields;
let faceted_updated =
(&existing_fields - &old_faceted_fields) != (&existing_fields - &new_faceted_fields);

let stop_words_updated = self.update_stop_words()?;
let non_separator_tokens_updated = self.update_non_separator_tokens()?;
Expand Down
Loading