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.

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

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

merged 5 commits into from
Mar 19, 2024

Conversation

Kerollmops
Copy link
Member

Bring the v1.7.1 changes back to main.

Kerollmops and others added 4 commits March 12, 2024 16:18
4487: Update version for the next release (v1.7.1) in Cargo.toml r=Kerollmops a=meili-bot

⚠️ This PR is automatically generated. Check the new version is the expected one and Cargo.lock has been updated before merging.

Co-authored-by: Kerollmops <Kerollmops@users.noreply.github.com>
4479: Skip reindexing when modifying unknown faceted fields r=dureuill a=Kerollmops

This PR improves Meilisearch's decision to reindex when a faceted field is added to the settings, but not a single document contains this field. It is effectively a waste of time to reindex documents when the engine needs to know a field.

This is related to a conversation [we have with our biggest customer (internal link)](https://discord.com/channels/1006923006964154428/1101213808627830794/1217112918857089187). They have 170 million documents, so reindexing this amount would be problematic.

---

The image is available by using the following Docker command. You can see the advancement of the image's build [on the GitHub CI page](https://github.com/meilisearch/meilisearch/actions/runs/8251688778).

```
docker pull getmeili/meilisearch:prototype-no-reindex-unknown-fields-0
```

Here is the hand-made test that shows that when modifying unknown filterable attributes, here `lol`, it doesn't reindex. However, when modifying the known `genre` field, it does reindex. You can see all that by looking at the time spent processing the update.

```json
{
  "uid": 3,
  "indexUid": "movies",
  "status": "succeeded",
  "type": "settingsUpdate",
  "canceledBy": null,
  "details": {
    "filterableAttributes": [
      "genres"
    ]
  },
  "error": null,
  "duration": "PT9.237703S",
  "enqueuedAt": "2024-03-12T15:34:26.836083Z",
  "startedAt": "2024-03-12T15:34:26.836374Z",
  "finishedAt": "2024-03-12T15:34:36.074077Z"
},
{
  "uid": 2,
  "indexUid": "movies",
  "status": "succeeded",
  "type": "settingsUpdate",
  "canceledBy": null,
  "details": {
    "filterableAttributes": [
      "lol"
    ]
  },
  "error": null,
  "duration": "PT0.000751S",
  "enqueuedAt": "2024-03-12T15:33:53.563923Z",
  "startedAt": "2024-03-12T15:33:53.565259Z",
  "finishedAt": "2024-03-12T15:33:53.56601Z"
},
{
  "uid": 0,
  "indexUid": "movies",
  "status": "succeeded",
  "type": "documentAdditionOrUpdate",
  "canceledBy": null,
  "details": {
    "receivedDocuments": 31944,
    "indexedDocuments": 31944
  },
  "error": null,
  "duration": "PT3.120723S",
  "enqueuedAt": "2024-02-17T10:35:55.042864Z",
  "startedAt": "2024-02-17T10:35:55.043505Z",
  "finishedAt": "2024-02-17T10:35:58.164228Z"
}
```

Co-authored-by: Clément Renault <clement@meilisearch.com>
@Kerollmops Kerollmops modified the milestone: v1.7.1 Mar 19, 2024
dureuill
dureuill previously approved these changes Mar 19, 2024
Copy link
Contributor

@dureuill dureuill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☀️

bors merge

Copy link
Contributor

meili-bors bot commented Mar 19, 2024

Merge conflict.

Copy link
Contributor

@dureuill dureuill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

Copy link
Contributor

meili-bors bot commented Mar 19, 2024

@meili-bors meili-bors bot merged commit fced2ff into main Mar 19, 2024
10 checks passed
@meili-bot meili-bot added the v1.7.1 PRs/issues solved in v1.7.1 label Mar 19, 2024
@curquiza
Copy link
Member

⚠️ @Kerollmops and @dureuill for future merges: we never fix git conflict on a release-v* branch because when fixing git conflicts, you brought all commits from main into this branch, meaning we cannot use this branch for future releases (like v1.7.2)
You should follow this guide instead: https://github.com/meilisearch/engine-team/blob/main/resources/meilisearch-release.md#after-the-release-bring-back-changes-to-main

@dureuill
Copy link
Contributor

woops, our bad curqui, I had missed that 😨

@Kerollmops Kerollmops changed the title Release v1.7.1 Bring back v1.7.1 into main Mar 19, 2024
@curquiza
Copy link
Member

Don't worry, Tamo noticed it before releasing v1.7.2, so we did not make any mistake in production, which is the most important 😊

meili-bors bot added a commit that referenced this pull request Mar 19, 2024
4510: Revert "Merge remote-tracking branch 'origin/main' into release-v1.7.1" r=Kerollmops a=irevoire

In #4502 we merged main into release-v1.7.1 instead of a temporary branch thus we now need to revert this merge commit.

This reverts commit bd74cce, reversing changes made to d2f77e8.


Co-authored-by: Tamo <tamo@meilisearch.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.7.1 PRs/issues solved in v1.7.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants