Move functions to deserialize documents to milli

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,4 @@
 contact_links:
-  - name: Language support request & feedback
-    url: https://github.com/meilisearch/product/discussions/categories/feedback-feature-proposal?discussions_q=label%3Aproduct%3Acore%3Atokenizer+category%3A%22Feedback+%26+Feature+Proposal%22
-    about:  The requests and feedback regarding Language support are not managed in this repository. Please upvote the related discussion in our dedicated product repository or open a new one if it doesn't exist.
   - name: Feature request & feedback
     url: https://github.com/meilisearch/product/discussions/categories/feedback-feature-proposal
     about: The feature requests and feedback regarding the already existing features are not managed in this repository. Please open a discussion in our dedicated product repository

.github/dependabot.yml

@@ -1,13 +0,0 @@
-# Set update schedule for GitHub Actions only
-
-version: 2
-updates:
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    labels:
-      - 'skip changelog'
-      - 'dependencies'
-    rebase-strategy: disabled

.github/is-latest-release.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
-# Was used in our CIs to publish the latest docker image. Not used anymore, will be used again when v1 and v2 will be out and we will want to maintain multiple stable versions.
-# Returns "true" or "false" (as a string) to be used in the `if` in GHA
-
 # Checks if the current tag should be the latest (in terms of semver and not of release date).
-# Ex: previous tag -> v2.1.1
-#     new tag -> v1.20.3
-#     The new tag (v1.20.3) should NOT be the latest
-#     So it returns "false", the `latest` tag should not be updated for the release v1.20.3 and still need to correspond to v2.1.1
+# Ex: previous tag -> v0.10.1
+#     new tag -> v0.8.12
+#     The new tag should not be the latest
+#     So it returns "false", the CI should not run for the release v0.8.2
+
+# Used in GHA in publish-docker-latest.yml
+# Returns "true" or "false" (as a string) to be used in the `if` in GHA
 
 # GLOBAL
 GREP_SEMVER_REGEXP='v\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)$' # i.e. v[number].[number].[number]

.github/scripts/check-release.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# check_tag $current_tag $file_tag $file_name
-function check_tag {
-  if [[ "$1" != "$2" ]]; then
-      echo "Error: the current tag does not match the version in $3: found $2 - expected $1"
-      ret=1
-  fi
-}
-
-ret=0
-current_tag=${GITHUB_REF#'refs/tags/v'}
-
-toml_files='*/Cargo.toml'
-for toml_file in $toml_files;
-do
-    file_tag="$(grep '^version = ' $toml_file | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')"
-    check_tag $current_tag $file_tag $toml_file
-done
-
-lock_file='Cargo.lock'
-lock_tag=$(grep -A 1 'name = "meilisearch-auth"' $lock_file | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
-check_tag $current_tag $lock_tag $lock_file
-
-if [[ "$ret" -eq 0 ]] ; then
-  echo 'OK'
-fi
-exit $ret

.github/workflows/README.md

@@ -0,0 +1,20 @@
+# GitHub Actions Workflow for Meilisearch
+
+> **Note:**
+
+> - We do not use [cache](https://github.com/actions/cache) yet but we could use it to speed up CI
+
+## Workflow
+
+- On each pull request, we trigger `cargo test`.
+- On each tag, we build:
+    - the tagged Docker image and publish it to Docker Hub
+    - the binaries for MacOS, Ubuntu, and Windows
+    - the Debian package
+- On each stable release (`v*.*.*` tag):
+    - we build the `latest` Docker image and publish it to Docker Hub
+    - we publish the binary to Hombrew and Gemfury
+
+## Problems
+
+- We do not test on Windows because we are unable to make it work, there is a disk space problem.

.github/workflows/coverage.yml

@@ -8,7 +8,7 @@ jobs:
   nightly-coverage:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
@@ -25,7 +25,7 @@ jobs:
           RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=unwind -Zpanic_abort_tests"
       - uses: actions-rs/grcov@v0.1
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ${{ steps.coverage.outputs.report }}

.github/workflows/create-issue-dependencies.yml

@@ -1,23 +0,0 @@
-name: Create issue to upgrade dependencies
-on:
-  schedule:
-    - cron: '0 0 1 */3 *'
-  workflow_dispatch:
-  
-jobs:
-  create-issue:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Create an issue
-      uses: actions-ecosystem/action-create-issue@v1
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        title: Upgrade dependencies
-        body: |
-          We need to update the dependencies of the Meilisearch repository, and, if possible, the dependencies of all the core-team repositories that Meilisearch depends on (milli, charabia, heed...).
-
-          ⚠️ This issue should only be done at the beginning of the sprint!     
-        labels: |
-          dependencies
-          maintenance

.github/workflows/flaky.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-18.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Install cargo-flaky
       run: cargo install cargo-flaky
     - name: Run cargo flaky 100 times

.github/workflows/publish-binaries.yml

@@ -5,33 +5,9 @@ on:
 name: Publish binaries to release
 
 jobs:
-  check-version:
-    name: Check the version validity
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      # Check if the tag has the v<nmumber>.<number>.<number> format.
-      # If yes, it means we are publishing an official release.
-      # If no, we are releasing a RC, so no need to check the version.
-      - name: Check tag format
-        if: github.event_name != 'schedule'
-        id: check-tag-format
-        run: |
-          escaped_tag=$(printf "%q" ${{ github.ref_name }})
-
-          if [[ $escaped_tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo ::set-output name=stable::true
-          else
-            echo ::set-output name=stable::false
-          fi
-      - name: Check release validity
-        if: steps.check-tag-format.outputs.stable == 'true'
-        run: bash .github/scripts/check-release.sh
-
   publish:
     name: Publish binary for ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    needs: check-version
     strategy:
       fail-fast: false
       matrix:
@@ -51,7 +27,7 @@ jobs:
     - uses: hecrj/setup-rust-action@master
       with:
         rust-version: stable
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Build
       run: cargo build --release --locked
     - name: Upload binaries to release
@@ -65,7 +41,6 @@ jobs:
   publish-aarch64:
     name: Publish binary for aarch64
     runs-on: ${{ matrix.os }}
-    needs: check-version
     continue-on-error: false
     strategy:
       fail-fast: false
@@ -80,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Installing Rust toolchain
         uses: actions-rs/toolchain@v1

.github/workflows/publish-deb-brew-pkg.yml

@@ -5,25 +5,16 @@ on:
     types: [released]
 
 jobs:
-  check-version:
-    name: Check the version validity
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Check release validity
-        run: bash .github/scripts/check-release.sh
-
   debian:
     name: Publish debian packagge
     runs-on: ubuntu-18.04
-    needs: check-version
     steps:
     - uses: hecrj/setup-rust-action@master
       with:
         rust-version: stable
     - name: Install cargo-deb
       run: cargo install cargo-deb
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Build deb package
       run: cargo deb -p meilisearch-http -o target/debian/meilisearch.deb
     - name: Upload debian pkg to release
@@ -39,7 +30,6 @@ jobs:
   homebrew:
     name: Bump Homebrew formula
     runs-on: ubuntu-18.04
-    needs: check-version
     steps:
       - name: Create PR to Homebrew
         uses: mislav/bump-homebrew-formula-action@v1

.github/workflows/publish-docker-images.yml

@@ -5,6 +5,8 @@ on:
   push:
     tags:
       - '*'
+  release:
+    types: [released]
 
 name: Publish tagged images to Docker Hub
 
@@ -12,58 +14,49 @@ jobs:
   docker:
     runs-on: docker
     steps:
-      - uses: actions/checkout@v2
-
-      # Check if the tag has the v<nmumber>.<number>.<number> format. If yes, it means we are publishing an official release.
-      # In this situation, we need to set `output.stable` to create/update the following tags (additionally to the `vX.Y.Z` Docker tag):
-      # - a `vX.Y` (without patch version) Docker tag
-      # - a `latest` Docker tag
-      - name: Check tag format
-        if: github.event_name != 'schedule'
-        id: check-tag-format
-        run: |
-          escaped_tag=$(printf "%q" ${{ github.ref_name }})
-
-          if [[ $escaped_tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo ::set-output name=stable::true
-          else
-            echo ::set-output name=stable::false
-          fi
-
-      # Check only the validity of the tag for official releases (not for pre-releases or other tags)
-      - name: Check release validity
-        if: github.event_name != 'schedule' && steps.check-tag-format.outputs.stable == 'true'
-        run: bash .github/scripts/check-release.sh
-
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
 
-      - name: Login to Docker Hub
+      - name: Login to DockerHub
         if: github.event_name != 'schedule'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Check tag format
+        id: check-tag-format
+        run: |
+          # Escape submitted tag name
+          escaped_tag=$(printf "%q" ${{ github.ref_name }})
+
+          # Check if tag has format v<nmumber>.<number>.<number> and set output.match
+          # to create a vX.Y (without patch version) Docker tag
+          if [[ $escaped_tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo ::set-output name=match::true
+          else
+            echo ::set-output name=match::false
+          fi
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
           images: getmeili/meilisearch
-          # The lastest and `vX.Y` tags are only pushed for the official Meilisearch releases
+          # The lastest tag is only pushed for the official Meilisearch release
           # See https://github.com/docker/metadata-action#latest-tag
           flavor: latest=false
           tags: |
             type=ref,event=tag
-            type=semver,pattern=v{{major}}.{{minor}},enable=${{ steps.check-tag-format.outputs.stable == 'true' }}
-            type=raw,value=latest,enable=${{ steps.check-tag-format.outputs.stable == 'true' }}
+            type=semver,pattern=v{{major}}.{{minor}},enable=${{ steps.check-tag-format.outputs.match }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
         with:
           # We do not push tags for the cron jobs, this is only for test purposes
           push: ${{ github.event_name != 'schedule' }}

.github/workflows/rust.yml

@@ -23,10 +23,9 @@ jobs:
       matrix:
         os: [ubuntu-18.04, macos-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v3
-    - uses: rui314/setup-mold@v1 # Optimize link time
+    - uses: actions/checkout@v2
     - name: Cache dependencies
-      uses: Swatinem/rust-cache@v2.0.0
+      uses: Swatinem/rust-cache@v1.3.0
     - name: Run cargo check without any default features
       uses: actions-rs/cargo@v1
       with:
@@ -43,15 +42,14 @@ jobs:
     name: Run tests in debug
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: rui314/setup-mold@v1 # Optimize link time
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.0.0
+        uses: Swatinem/rust-cache@v1.3.0
       - name: Run tests in debug
         uses: actions-rs/cargo@v1
         with:
@@ -62,8 +60,7 @@ jobs:
     name: Run Clippy
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: rui314/setup-mold@v1 # Optimize link time
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -71,7 +68,7 @@ jobs:
           override: true
           components: clippy
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.0.0
+        uses: Swatinem/rust-cache@v1.3.0
       - name: Run cargo clippy
         uses: actions-rs/cargo@v1
         with:
@@ -82,8 +79,7 @@ jobs:
     name: Run Rustfmt
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: rui314/setup-mold@v1 # Optimize link time
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -91,6 +87,6 @@ jobs:
           override: true
           components: rustfmt
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.0.0
+        uses: Swatinem/rust-cache@v1.3.0
       - name: Run cargo fmt
         run: cargo fmt --all -- --check

CONTRIBUTING.md

@@ -5,7 +5,6 @@ First, thank you for contributing to Meilisearch! The goal of this document is t
 Remember that there are many ways to contribute other than writing code: writing [tutorials or blog posts](https://github.com/meilisearch/awesome-meilisearch), improving [the documentation](https://github.com/meilisearch/documentation), submitting [bug reports](https://github.com/meilisearch/meilisearch/issues/new?assignees=&labels=&template=bug_report.md&title=) and [feature requests](https://github.com/meilisearch/product/discussions/categories/feedback-feature-proposal)...
 
 ## Table of Contents
-
 - [Assumptions](#assumptions)
 - [How to Contribute](#how-to-contribute)
 - [Development Workflow](#development-workflow)
@@ -14,7 +13,7 @@ Remember that there are many ways to contribute other than writing code: writing
 
 ## Assumptions
 
-1. **You're familiar with [GitHub](https://github.com) and the [Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)(PR) workflow.**
+1. **You're familiar with [Github](https://github.com) and the [Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)(PR) workflow.**
 2. **You've read the Meilisearch [documentation](https://docs.meilisearch.com).**
 3. **You know about the [Meilisearch community](https://docs.meilisearch.com/learn/what_is_meilisearch/contact.html).
    Please use this for help.**
@@ -24,7 +23,7 @@ Remember that there are many ways to contribute other than writing code: writing
 1. Ensure your change has an issue! Find an
    [existing issue](https://github.com/meilisearch/meilisearch/issues/) or [open a new issue](https://github.com/meilisearch/meilisearch/issues/new).
    * This is where you can get a feel if the change will be accepted or not.
-2. Once approved, [fork the Meilisearch repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) in your own GitHub account.
+2. Once approved, [fork the Meilisearch repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) in your own Github account.
 3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository)
 4. Review the [Development Workflow](#development-workflow) section that describes the steps to maintain the repository.
 5. Make your changes on your branch.
@@ -46,8 +45,6 @@ We recommend using the `--release` flag to test the full performance of Meilisea
 cargo test
 ```
 
-This command will be triggered to each PR as a requirement for merging it.
-
 If you get a "Too many open files" error you might want to increase the open file limit using this command:
 
 ```bash
@@ -72,7 +69,7 @@ As minimal requirements, your commit message should:
 
 We don't follow any other convention, but if you want to use one, we recommend [the Chris Beams one](https://chris.beams.io/posts/git-commit/).
 
-### GitHub Pull Requests
+### Github Pull Requests
 
 Some notes on GitHub PRs:
 
@@ -95,16 +92,6 @@ _[Read more about this](https://github.com/meilisearch/integration-guides/blob/m
 
 The full Meilisearch release process is described in [this guide](https://github.com/meilisearch/core-team/blob/main/resources/meilisearch-release.md). Please follow it carefully before doing any release.
 
-### Release assets
-
-For each release, the following assets are created:
-- Binaries for differents platforms (Linux, MacOS, Windows and ARM architectures) are attached to the GitHub release
-- Binaries are pushed to HomeBrew and APT (not published for RC)
-- Docker tags are created/updated:
-  - `vX.Y.Z`
-  - `vX.Y` (not published for RC)
-  - `latest` (not published for RC)
-
 <hr>
 
 Thank you again for reading this through, we can not wait to begin to work with you if you made your way through this contributing guide ❤️

Cargo.lock

@@ -408,15 +408,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "199edb7b90631283b10c2422e6a0bc8b7d987bf732995ba1de53b576c97e51a8"
 
-[[package]]
-name = "bimap"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -1123,8 +1114,7 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "0.31.2"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.31.2#132558bf6a4e434de2a48314c4a208dea295a992"
+version = "0.29.3"
 dependencies = [
  "nom",
  "nom_locate",
@@ -1148,8 +1138,7 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "0.31.2"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.31.2#132558bf6a4e434de2a48314c4a208dea295a992"
+version = "0.29.3"
 dependencies = [
  "serde_json",
 ]
@@ -1661,8 +1650,7 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "0.31.2"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.31.2#132558bf6a4e434de2a48314c4a208dea295a992"
+version = "0.29.3"
 dependencies = [
  "serde_json",
 ]
@@ -2001,8 +1989,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "meilisearch-auth"
-version = "0.28.1"
+version = "0.28.0"
 dependencies = [
+ "base64",
  "enum-iterator",
  "hmac",
  "meilisearch-types",
@@ -2013,12 +2002,12 @@ dependencies = [
  "sha2",
  "thiserror",
  "time 0.3.9",
- "uuid 1.1.2",
+ "uuid",
 ]
 
 [[package]]
 name = "meilisearch-http"
-version = "0.28.1"
+version = "0.28.0"
 dependencies = [
  "actix-cors",
  "actix-rt",
@@ -2068,6 +2057,7 @@ dependencies = [
  "serde",
  "serde-cs",
  "serde_json",
+ "serde_url_params",
  "sha-1",
  "sha2",
  "siphasher",
@@ -2082,16 +2072,15 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "urlencoding",
- "uuid 1.1.2",
+ "uuid",
  "vergen",
  "walkdir",
- "yaup",
  "zip",
 ]
 
 [[package]]
 name = "meilisearch-lib"
-version = "0.28.1"
+version = "0.28.0"
 dependencies = [
  "actix-rt",
  "actix-web",
@@ -2146,16 +2135,17 @@ dependencies = [
  "thiserror",
  "time 0.3.9",
  "tokio",
- "uuid 1.1.2",
+ "uuid",
  "walkdir",
  "whoami",
 ]
 
 [[package]]
 name = "meilisearch-types"
-version = "0.28.1"
+version = "0.28.0"
 dependencies = [
  "actix-web",
+ "milli",
  "proptest",
  "proptest-derive",
  "serde",
@@ -2188,10 +2178,8 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "0.31.2"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.31.2#132558bf6a4e434de2a48314c4a208dea295a992"
+version = "0.29.3"
 dependencies = [
- "bimap",
  "bincode",
  "bstr",
  "byteorder",
@@ -2228,7 +2216,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "time 0.3.9",
- "uuid 0.8.2",
+ "uuid",
 ]
 
 [[package]]
@@ -2514,7 +2502,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "permissive-json-pointer"
-version = "0.28.1"
+version = "0.2.0"
 dependencies = [
  "big_s",
  "serde_json",
@@ -3112,6 +3100,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_url_params"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c43307d0640738af32fe8d01e47119bc0fc8a686be470a44a586caff76dfb34"
+dependencies = [
+ "serde",
+ "url",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3675,15 +3673,6 @@ name = "uuid"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "uuid"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 dependencies = [
  "getrandom",
  "serde",
@@ -3992,16 +3981,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1"
 
-[[package]]
-name = "yaup"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bc9ef6963f7e857050aabf31ebc44184f278bcfec4c3671552c1a916b152b45"
-dependencies = [
- "serde",
- "url",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.3.0"

README.md

@@ -63,7 +63,7 @@ docker run -p 7700:7700 -v "$(pwd)/meili_data:/meili_data" getmeili/meilisearch
 
 #### Announcing a cloud-hosted Meilisearch
 
-Join the closed beta by filling out this [form](https://meilisearch.typeform.com/to/VI2cI2rv).
+Join the closed beta by filling out this [form](https://meilisearch.typeform.com/to/FtnzvZfh).
 
 #### Try Meilisearch in our Sandbox
 

meilisearch-auth/Cargo.toml

@@ -1,17 +1,18 @@
 [package]
 name = "meilisearch-auth"
-version = "0.28.1"
+version = "0.28.0"
 edition = "2021"
 
 [dependencies]
+base64 = "0.13.0"
 enum-iterator = "0.7.0"
 hmac = "0.12.1"
 meilisearch-types = { path = "../meilisearch-types" }
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.31.2" }
+milli = { path = "../../milli/milli" }
 rand = "0.8.4"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = { version = "1.0.79", features = ["preserve_order"] }
 sha2 = "0.10.2"
 thiserror = "1.0.30"
 time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] }
-uuid = { version = "1.1.2", features = ["serde", "v4"] }
+uuid = { version = "0.8.2", features = ["serde", "v4"] }

meilisearch-auth/src/action.rs

@@ -1,24 +1,19 @@
 use enum_iterator::IntoEnumIterator;
 use serde::{Deserialize, Serialize};
-use std::hash::Hash;
 
-#[derive(IntoEnumIterator, Copy, Clone, Serialize, Deserialize, Debug, Eq, PartialEq, Hash)]
+#[derive(IntoEnumIterator, Copy, Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
 #[repr(u8)]
 pub enum Action {
     #[serde(rename = "*")]
     All = actions::ALL,
     #[serde(rename = "search")]
     Search = actions::SEARCH,
-    #[serde(rename = "documents.*")]
-    DocumentsAll = actions::DOCUMENTS_ALL,
     #[serde(rename = "documents.add")]
     DocumentsAdd = actions::DOCUMENTS_ADD,
     #[serde(rename = "documents.get")]
     DocumentsGet = actions::DOCUMENTS_GET,
     #[serde(rename = "documents.delete")]
     DocumentsDelete = actions::DOCUMENTS_DELETE,
-    #[serde(rename = "indexes.*")]
-    IndexesAll = actions::INDEXES_ALL,
     #[serde(rename = "indexes.create")]
     IndexesAdd = actions::INDEXES_CREATE,
     #[serde(rename = "indexes.get")]
@@ -27,22 +22,14 @@ pub enum Action {
     IndexesUpdate = actions::INDEXES_UPDATE,
     #[serde(rename = "indexes.delete")]
     IndexesDelete = actions::INDEXES_DELETE,
-    #[serde(rename = "tasks.*")]
-    TasksAll = actions::TASKS_ALL,
     #[serde(rename = "tasks.get")]
     TasksGet = actions::TASKS_GET,
-    #[serde(rename = "settings.*")]
-    SettingsAll = actions::SETTINGS_ALL,
     #[serde(rename = "settings.get")]
     SettingsGet = actions::SETTINGS_GET,
     #[serde(rename = "settings.update")]
     SettingsUpdate = actions::SETTINGS_UPDATE,
-    #[serde(rename = "stats.*")]
-    StatsAll = actions::STATS_ALL,
     #[serde(rename = "stats.get")]
     StatsGet = actions::STATS_GET,
-    #[serde(rename = "dumps.*")]
-    DumpsAll = actions::DUMPS_ALL,
     #[serde(rename = "dumps.create")]
     DumpsCreate = actions::DUMPS_CREATE,
     #[serde(rename = "version")]
@@ -63,23 +50,17 @@ impl Action {
         match repr {
             ALL => Some(Self::All),
             SEARCH => Some(Self::Search),
-            DOCUMENTS_ALL => Some(Self::DocumentsAll),
             DOCUMENTS_ADD => Some(Self::DocumentsAdd),
             DOCUMENTS_GET => Some(Self::DocumentsGet),
             DOCUMENTS_DELETE => Some(Self::DocumentsDelete),
-            INDEXES_ALL => Some(Self::IndexesAll),
             INDEXES_CREATE => Some(Self::IndexesAdd),
             INDEXES_GET => Some(Self::IndexesGet),
             INDEXES_UPDATE => Some(Self::IndexesUpdate),
             INDEXES_DELETE => Some(Self::IndexesDelete),
-            TASKS_ALL => Some(Self::TasksAll),
             TASKS_GET => Some(Self::TasksGet),
-            SETTINGS_ALL => Some(Self::SettingsAll),
             SETTINGS_GET => Some(Self::SettingsGet),
             SETTINGS_UPDATE => Some(Self::SettingsUpdate),
-            STATS_ALL => Some(Self::StatsAll),
             STATS_GET => Some(Self::StatsGet),
-            DUMPS_ALL => Some(Self::DumpsAll),
             DUMPS_CREATE => Some(Self::DumpsCreate),
             VERSION => Some(Self::Version),
             KEYS_CREATE => Some(Self::KeysAdd),
@@ -95,23 +76,17 @@ impl Action {
         match self {
             Self::All => ALL,
             Self::Search => SEARCH,
-            Self::DocumentsAll => DOCUMENTS_ALL,
             Self::DocumentsAdd => DOCUMENTS_ADD,
             Self::DocumentsGet => DOCUMENTS_GET,
             Self::DocumentsDelete => DOCUMENTS_DELETE,
-            Self::IndexesAll => INDEXES_ALL,
             Self::IndexesAdd => INDEXES_CREATE,
             Self::IndexesGet => INDEXES_GET,
             Self::IndexesUpdate => INDEXES_UPDATE,
             Self::IndexesDelete => INDEXES_DELETE,
-            Self::TasksAll => TASKS_ALL,
             Self::TasksGet => TASKS_GET,
-            Self::SettingsAll => SETTINGS_ALL,
             Self::SettingsGet => SETTINGS_GET,
             Self::SettingsUpdate => SETTINGS_UPDATE,
-            Self::StatsAll => STATS_ALL,
             Self::StatsGet => STATS_GET,
-            Self::DumpsAll => DUMPS_ALL,
             Self::DumpsCreate => DUMPS_CREATE,
             Self::Version => VERSION,
             Self::KeysAdd => KEYS_CREATE,
@@ -125,27 +100,21 @@ impl Action {
 pub mod actions {
     pub(crate) const ALL: u8 = 0;
     pub const SEARCH: u8 = 1;
-    pub const DOCUMENTS_ALL: u8 = 2;
-    pub const DOCUMENTS_ADD: u8 = 3;
-    pub const DOCUMENTS_GET: u8 = 4;
-    pub const DOCUMENTS_DELETE: u8 = 5;
-    pub const INDEXES_ALL: u8 = 6;
-    pub const INDEXES_CREATE: u8 = 7;
-    pub const INDEXES_GET: u8 = 8;
-    pub const INDEXES_UPDATE: u8 = 9;
-    pub const INDEXES_DELETE: u8 = 10;
-    pub const TASKS_ALL: u8 = 11;
-    pub const TASKS_GET: u8 = 12;
-    pub const SETTINGS_ALL: u8 = 13;
-    pub const SETTINGS_GET: u8 = 14;
-    pub const SETTINGS_UPDATE: u8 = 15;
-    pub const STATS_ALL: u8 = 16;
-    pub const STATS_GET: u8 = 17;
-    pub const DUMPS_ALL: u8 = 18;
-    pub const DUMPS_CREATE: u8 = 19;
-    pub const VERSION: u8 = 20;
-    pub const KEYS_CREATE: u8 = 21;
-    pub const KEYS_GET: u8 = 22;
-    pub const KEYS_UPDATE: u8 = 23;
-    pub const KEYS_DELETE: u8 = 24;
+    pub const DOCUMENTS_ADD: u8 = 2;
+    pub const DOCUMENTS_GET: u8 = 3;
+    pub const DOCUMENTS_DELETE: u8 = 4;
+    pub const INDEXES_CREATE: u8 = 5;
+    pub const INDEXES_GET: u8 = 6;
+    pub const INDEXES_UPDATE: u8 = 7;
+    pub const INDEXES_DELETE: u8 = 8;
+    pub const TASKS_GET: u8 = 9;
+    pub const SETTINGS_GET: u8 = 10;
+    pub const SETTINGS_UPDATE: u8 = 11;
+    pub const STATS_GET: u8 = 12;
+    pub const DUMPS_CREATE: u8 = 13;
+    pub const VERSION: u8 = 15;
+    pub const KEYS_CREATE: u8 = 16;
+    pub const KEYS_GET: u8 = 17;
+    pub const KEYS_UPDATE: u8 = 18;
+    pub const KEYS_DELETE: u8 = 19;
 }

meilisearch-auth/src/lib.rs

@@ -18,7 +18,7 @@ pub use action::{actions, Action};
 use error::{AuthControllerError, Result};
 pub use key::Key;
 use meilisearch_types::star_or::StarOr;
-use store::generate_key_as_hexa;
+use store::generate_key_as_base64;
 pub use store::open_auth_store_env;
 use store::HeedAuthStore;
 
@@ -139,7 +139,7 @@ impl AuthController {
     pub fn generate_key(&self, uid: Uuid) -> Option<String> {
         self.master_key
             .as_ref()
-            .map(|master_key| generate_key_as_hexa(uid, master_key.as_bytes()))
+            .map(|master_key| generate_key_as_base64(uid.as_bytes(), master_key.as_bytes()))
     }
 
     /// Check if the provided key is authorized to make a specific action

meilisearch-auth/src/store.rs

@@ -1,6 +1,5 @@
 use std::borrow::Cow;
 use std::cmp::Reverse;
-use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::convert::TryInto;
 use std::fs::create_dir_all;
@@ -14,9 +13,8 @@ use hmac::{Hmac, Mac};
 use meilisearch_types::star_or::StarOr;
 use milli::heed::types::{ByteSlice, DecodeIgnore, SerdeJson};
 use milli::heed::{Database, Env, EnvOpenOptions, RwTxn};
-use sha2::Sha256;
+use sha2::{Digest, Sha256};
 use time::OffsetDateTime;
-use uuid::fmt::Hyphenated;
 use uuid::Uuid;
 
 use super::error::Result;
@@ -89,48 +87,12 @@ impl HeedAuthStore {
         // create inverted database.
         let db = self.action_keyid_index_expiration;
 
-        let mut actions = HashSet::new();
-        for action in &key.actions {
-            match action {
-                Action::All => actions.extend(Action::into_enum_iter()),
-                Action::DocumentsAll => {
-                    actions.extend(
-                        [
-                            Action::DocumentsGet,
-                            Action::DocumentsDelete,
-                            Action::DocumentsAdd,
-                        ]
-                        .iter(),
-                    );
-                }
-                Action::IndexesAll => {
-                    actions.extend(
-                        [
-                            Action::IndexesAdd,
-                            Action::IndexesDelete,
-                            Action::IndexesGet,
-                            Action::IndexesUpdate,
-                        ]
-                        .iter(),
-                    );
-                }
-                Action::SettingsAll => {
-                    actions.extend([Action::SettingsGet, Action::SettingsUpdate].iter());
-                }
-                Action::DumpsAll => {
-                    actions.insert(Action::DumpsCreate);
-                }
-                Action::TasksAll => {
-                    actions.insert(Action::TasksGet);
-                }
-                Action::StatsAll => {
-                    actions.insert(Action::StatsGet);
-                }
-                other => {
-                    actions.insert(*other);
-                }
-            }
-        }
+        let actions = if key.actions.contains(&Action::All) {
+            // if key.actions contains All, we iterate over all actions.
+            Action::into_enum_iter().collect()
+        } else {
+            key.actions.clone()
+        };
 
         let no_index_restriction = key.indexes.contains(&StarOr::Star);
         for action in actions {
@@ -170,16 +132,13 @@ impl HeedAuthStore {
             .remap_data_type::<DecodeIgnore>()
             .iter(&rtxn)?
             .filter_map(|res| match res {
-                Ok((uid, _)) => {
+                Ok((uid, _))
+                    if generate_key_as_base64(uid, master_key).as_bytes() == encoded_key =>
+                {
                     let (uid, _) = try_split_array_at(uid)?;
-                    let uid = Uuid::from_bytes(*uid);
-                    if generate_key_as_hexa(uid, master_key).as_bytes() == encoded_key {
-                        Some(uid)
-                    } else {
-                        None
-                    }
+                    Some(Uuid::from_bytes(*uid))
                 }
-                Err(_) => None,
+                _ => None,
             })
             .next();
 
@@ -285,17 +244,13 @@ impl<'a> milli::heed::BytesEncode<'a> for KeyIdActionCodec {
     }
 }
 
-pub fn generate_key_as_hexa(uid: Uuid, master_key: &[u8]) -> String {
-    // format uid as hyphenated allowing user to generate their own keys.
-    let mut uid_buffer = [0; Hyphenated::LENGTH];
-    let uid = uid.hyphenated().encode_lower(&mut uid_buffer);
-
-    // new_from_slice function never fail.
-    let mut mac = Hmac::<Sha256>::new_from_slice(master_key).unwrap();
-    mac.update(uid.as_bytes());
+pub fn generate_key_as_base64(uid: &[u8], master_key: &[u8]) -> String {
+    let master_key_sha = Sha256::digest(master_key);
+    let mut mac = Hmac::<Sha256>::new_from_slice(master_key_sha.as_slice()).unwrap();
+    mac.update(uid);
 
     let result = mac.finalize();
-    format!("{:x}", result.into_bytes())
+    base64::encode_config(result.into_bytes(), base64::URL_SAFE_NO_PAD)
 }
 
 /// Divides one slice into two at an index, returns `None` if mid is out of bounds.

meilisearch-http/Cargo.toml

@@ -4,7 +4,7 @@ description = "Meilisearch HTTP server"
 edition = "2021"
 license = "MIT"
 name = "meilisearch-http"
-version = "0.28.1"
+version = "0.28.0"
 
 [[bin]]
 name = "meilisearch"
@@ -75,7 +75,7 @@ thiserror = "1.0.30"
 time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] }
 tokio = { version = "1.17.0", features = ["full"] }
 tokio-stream = "0.1.8"
-uuid = { version = "1.1.2", features = ["serde", "v4"] }
+uuid = { version = "0.8.2", features = ["serde", "v4"] }
 walkdir = "2.3.2"
 
 [dev-dependencies]
@@ -83,8 +83,8 @@ actix-rt = "2.7.0"
 assert-json-diff = "2.0.1"
 manifest-dir-macros = "0.1.14"
 maplit = "1.0.2"
+serde_url_params = "0.2.1"
 urlencoding = "2.1.0"
-yaup = "0.2.0"
 
 [features]
 default = ["analytics", "mini-dashboard"]
@@ -105,5 +105,5 @@ mini-dashboard = [
 tikv-jemallocator = "0.4.3"
 
 [package.metadata.mini-dashboard]
-assets-url = "https://github.com/meilisearch/mini-dashboard/releases/download/v0.2.1/build.zip"
-sha1 = "05a02ff13c3982091884a3f81d28bf53e72607b2"
+assets-url = "https://github.com/meilisearch/mini-dashboard/releases/download/v0.1.10/build.zip"
+sha1 = "1adf96592c267425c110bfefc36b7fc6bfb0f93d"

meilisearch-http/src/analytics/segment_analytics.rs

@@ -574,7 +574,7 @@ impl DocumentsAggregator {
         let content_type = request
             .headers()
             .get(CONTENT_TYPE)
-            .and_then(|s| s.to_str().ok())
+            .map(|s| s.to_str().unwrap_or("unknown"))
             .unwrap_or("unknown")
             .to_string();
         ret.content_types.insert(content_type);
@@ -591,13 +591,13 @@ impl DocumentsAggregator {
 
         self.updated |= other.updated;
         // we can't create a union because there is no `into_union` method
-        for user_agent in other.user_agents {
+        for user_agent in other.user_agents.into_iter() {
             self.user_agents.insert(user_agent);
         }
-        for primary_key in other.primary_keys {
+        for primary_key in other.primary_keys.into_iter() {
             self.primary_keys.insert(primary_key);
         }
-        for content_type in other.content_types {
+        for content_type in other.content_types.into_iter() {
             self.content_types.insert(content_type);
         }
         self.index_creation |= other.index_creation;

meilisearch-http/src/helpers/env.rs

@@ -1,17 +0,0 @@
-use meilisearch_lib::heed::Env;
-use walkdir::WalkDir;
-
-pub trait EnvSizer {
-    fn size(&self) -> u64;
-}
-
-impl EnvSizer for Env {
-    fn size(&self) -> u64 {
-        WalkDir::new(self.path())
-            .into_iter()
-            .filter_map(|entry| entry.ok())
-            .filter_map(|entry| entry.metadata().ok())
-            .filter(|metadata| metadata.is_file())
-            .fold(0, |acc, m| acc + m.len())
-    }
-}

meilisearch-http/src/helpers/mod.rs

@@ -1,3 +0,0 @@
-mod env;
-
-pub use env::EnvSizer;

meilisearch-http/src/lib.rs

@@ -5,7 +5,6 @@ pub mod analytics;
 pub mod task;
 #[macro_use]
 pub mod extractors;
-pub mod helpers;
 pub mod option;
 pub mod routes;
 
@@ -31,7 +30,7 @@ pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<MeiliSearch> {
     let mut meilisearch = MeiliSearch::builder();
 
     // enable autobatching?
-    AUTOBATCHING_ENABLED.store(
+    let _ = AUTOBATCHING_ENABLED.store(
         opt.scheduler_options.enable_auto_batching,
         std::sync::atomic::Ordering::Relaxed,
     );
@@ -84,17 +83,19 @@ pub fn configure_data(
             web::JsonConfig::default()
                 .content_type(|mime| mime == mime::APPLICATION_JSON)
                 .error_handler(|err, req: &HttpRequest| match err {
-                    JsonPayloadError::ContentType => match req.headers().get(CONTENT_TYPE) {
-                        Some(content_type) => MeilisearchHttpError::InvalidContentType(
-                            content_type.to_str().unwrap_or("unknown").to_string(),
-                            vec![mime::APPLICATION_JSON.to_string()],
-                        )
-                        .into(),
-                        None => MeilisearchHttpError::MissingContentType(vec![
-                            mime::APPLICATION_JSON.to_string(),
-                        ])
-                        .into(),
-                    },
+                    JsonPayloadError::ContentType => {
+                        match req.headers().get(CONTENT_TYPE) {
+                            Some(content_type) => MeilisearchHttpError::InvalidContentType(
+                                content_type.to_str().unwrap_or("unknown").to_string(),
+                                vec![mime::APPLICATION_JSON.to_string()],
+                            )
+                            .into(),
+                            None => MeilisearchHttpError::MissingContentType(vec![
+                                mime::APPLICATION_JSON.to_string(),
+                            ])
+                            .into(),
+                        }
+                    }
                     err => PayloadError::from(err).into(),
                 }),
         )

meilisearch-http/src/routes/indexes/documents.rs

@@ -46,7 +46,7 @@ fn payload_to_stream(mut payload: Payload) -> impl Stream<Item = Result<Bytes, P
 }
 
 /// Extracts the mime type from the content type and return
-/// a meilisearch error if anything bad happen.
+/// a meilisearch error if anyhthing bad happen.
 fn extract_mime_type(req: &HttpRequest) -> Result<Option<Mime>, MeilisearchHttpError> {
     match req.mime_type() {
         Ok(Some(mime)) => Ok(Some(mime)),

meilisearch-http/src/routes/indexes/search.rs

@@ -14,6 +14,7 @@ use serde_json::Value;
 use crate::analytics::{Analytics, SearchAggregator};
 use crate::extractors::authentication::{policies::*, GuardedData};
 use crate::extractors::sequential_extractor::SeqHandler;
+use crate::routes::{fold_star_or, StarOr};
 
 pub fn configure(cfg: &mut web::ServiceConfig) {
     cfg.service(
@@ -29,16 +30,16 @@ pub struct SearchQueryGet {
     q: Option<String>,
     offset: Option<usize>,
     limit: Option<usize>,
-    attributes_to_retrieve: Option<CS<String>>,
-    attributes_to_crop: Option<CS<String>>,
+    attributes_to_retrieve: Option<CS<StarOr<String>>>,
+    attributes_to_crop: Option<CS<StarOr<String>>>,
     #[serde(default = "DEFAULT_CROP_LENGTH")]
     crop_length: usize,
-    attributes_to_highlight: Option<CS<String>>,
+    attributes_to_highlight: Option<CS<StarOr<String>>>,
     filter: Option<String>,
     sort: Option<String>,
     #[serde(default = "Default::default")]
     show_matches_position: bool,
-    facets: Option<CS<String>>,
+    facets: Option<CS<StarOr<String>>>,
     #[serde(default = "DEFAULT_HIGHLIGHT_PRE_TAG")]
     highlight_pre_tag: String,
     #[serde(default = "DEFAULT_HIGHLIGHT_POST_TAG")]
@@ -61,18 +62,14 @@ impl From<SearchQueryGet> for SearchQuery {
             q: other.q,
             offset: other.offset,
             limit: other.limit.unwrap_or_else(DEFAULT_SEARCH_LIMIT),
-            attributes_to_retrieve: other
-                .attributes_to_retrieve
-                .map(|o| o.into_iter().collect()),
-            attributes_to_crop: other.attributes_to_crop.map(|o| o.into_iter().collect()),
+            attributes_to_retrieve: other.attributes_to_retrieve.and_then(fold_star_or),
+            attributes_to_crop: other.attributes_to_crop.and_then(fold_star_or),
             crop_length: other.crop_length,
-            attributes_to_highlight: other
-                .attributes_to_highlight
-                .map(|o| o.into_iter().collect()),
+            attributes_to_highlight: other.attributes_to_highlight.and_then(fold_star_or),
             filter,
             sort: other.sort.map(|attr| fix_sort_query_parameters(&attr)),
             show_matches_position: other.show_matches_position,
-            facets: other.facets.map(|o| o.into_iter().collect()),
+            facets: other.facets.and_then(fold_star_or),
             highlight_pre_tag: other.highlight_pre_tag,
             highlight_post_tag: other.highlight_post_tag,
             crop_marker: other.crop_marker,
@@ -111,9 +108,10 @@ fn fix_sort_query_parameters(sort_query: &str) -> Vec<String> {
             sort_parameters.push(current_sort.to_string());
             merge = true;
         } else if merge && !sort_parameters.is_empty() {
-            let s = sort_parameters.last_mut().unwrap();
-            s.push(',');
-            s.push_str(current_sort);
+            sort_parameters
+                .last_mut()
+                .unwrap()
+                .push_str(&format!(",{}", current_sort));
             if current_sort.ends_with("):desc") || current_sort.ends_with("):asc") {
                 merge = false;
             }

meilisearch-http/src/routes/indexes/settings.rs

@@ -318,7 +318,7 @@ make_setting_route!(
             "Pagination Updated".to_string(),
             json!({
                 "pagination": {
-                    "max_total_hits": setting.as_ref().and_then(|s| s.max_total_hits.set()),
+                    "limited_to": setting.as_ref().and_then(|s| s.limited_to.set()),
                 },
             }),
             Some(req),
@@ -349,9 +349,7 @@ generate_configure!(
     stop_words,
     synonyms,
     ranking_rules,
-    typo_tolerance,
-    pagination,
-    faceting
+    typo_tolerance
 );
 
 pub async fn update_all(
@@ -411,18 +409,6 @@ pub async fn update_all(
                         .map(|s| s.two_typos.set()))
                     .flatten(),
             },
-            "faceting": {
-                "max_values_per_facet": settings.faceting
-                    .as_ref()
-                    .set()
-                    .and_then(|s| s.max_values_per_facet.as_ref().set()),
-            },
-            "pagination": {
-                "max_total_hits": settings.pagination
-                    .as_ref()
-                    .set()
-                    .and_then(|s| s.max_total_hits.as_ref().set()),
-            },
         }),
         Some(&req),
     );

meilisearch-http/src/routes/tasks.rs

@@ -25,7 +25,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
 
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
-pub struct TasksFilterQuery {
+pub struct TaskFilterQuery {
     #[serde(rename = "type")]
     type_: Option<CS<StarOr<TaskType>>>,
     status: Option<CS<StarOr<TaskStatus>>>,
@@ -61,11 +61,17 @@ fn task_status_matches_events(status: &TaskStatus, events: &[TaskEvent]) -> bool
 
 async fn get_tasks(
     meilisearch: GuardedData<ActionPolicy<{ actions::TASKS_GET }>, MeiliSearch>,
-    params: web::Query<TasksFilterQuery>,
+    params: web::Query<TaskFilterQuery>,
     req: HttpRequest,
     analytics: web::Data<dyn Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
-    let TasksFilterQuery {
+    analytics.publish(
+        "Tasks Seen".to_string(),
+        json!({ "per_task_uid": false }),
+        Some(&req),
+    );
+
+    let TaskFilterQuery {
         type_,
         status,
         index_uid,
@@ -81,16 +87,6 @@ async fn get_tasks(
     let status: Option<Vec<_>> = status.and_then(fold_star_or);
     let index_uid: Option<Vec<_>> = index_uid.and_then(fold_star_or);
 
-    analytics.publish(
-        "Tasks Seen".to_string(),
-        json!({
-            "filtered_by_index_uid": index_uid.as_ref().map_or(false, |v| !v.is_empty()),
-            "filtered_by_type": type_.as_ref().map_or(false, |v| !v.is_empty()),
-            "filtered_by_status": status.as_ref().map_or(false, |v| !v.is_empty()),
-        }),
-        Some(&req),
-    );
-
     // Then we filter on potential indexes and make sure that the search filter
     // restrictions are also applied.
     let indexes_filters = match index_uid {

meilisearch-http/tests/auth/api_keys.rs

@@ -42,7 +42,6 @@ async fn add_valid_api_key() {
         "name": "indexing-key",
         "description": "Indexing API key",
         "uid": "4bc0887a-0e41-4f3b-935d-0c451dcee9c8",
-        "key": "d9e776b8412f1db6974c9a5556b961c3559440b6588216f4ea5d9ed49f7c8f3c",
         "indexes": ["products"],
         "actions": [
             "search",

meilisearch-http/tests/auth/authorization.rs

@@ -11,41 +11,41 @@ pub static AUTHORIZATIONS: Lazy<HashMap<(&'static str, &'static str), HashSet<&'
         hashmap! {
             ("POST",    "/indexes/products/search") =>                         hashset!{"search", "*"},
             ("GET",     "/indexes/products/search") =>                         hashset!{"search", "*"},
-            ("POST",    "/indexes/products/documents") =>                      hashset!{"documents.add", "documents.*", "*"},
-            ("GET",     "/indexes/products/documents") =>                      hashset!{"documents.get", "documents.*", "*"},
-            ("GET",     "/indexes/products/documents/0") =>                    hashset!{"documents.get", "documents.*", "*"},
-            ("DELETE",  "/indexes/products/documents/0") =>                    hashset!{"documents.delete", "documents.*", "*"},
-            ("GET",     "/tasks") =>                                           hashset!{"tasks.get", "tasks.*", "*"},
-            ("GET",     "/tasks?indexUid=products") =>                         hashset!{"tasks.get", "tasks.*", "*"},
-            ("GET",     "/tasks/0") =>                                         hashset!{"tasks.get", "tasks.*", "*"},
-            ("PATCH",   "/indexes/products/") =>                               hashset!{"indexes.update", "indexes.*", "*"},
-            ("GET",     "/indexes/products/") =>                               hashset!{"indexes.get", "indexes.*", "*"},
-            ("DELETE",  "/indexes/products/") =>                               hashset!{"indexes.delete", "indexes.*", "*"},
-            ("POST",    "/indexes") =>                                         hashset!{"indexes.create", "indexes.*", "*"},
-            ("GET",     "/indexes") =>                                         hashset!{"indexes.get", "indexes.*", "*"},
-            ("GET",     "/indexes/products/settings") =>                       hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/displayed-attributes") =>  hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/distinct-attribute") =>    hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/filterable-attributes") => hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/ranking-rules") =>         hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/searchable-attributes") => hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/sortable-attributes") =>   hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/stop-words") =>            hashset!{"settings.get", "settings.*", "*"},
-            ("GET",     "/indexes/products/settings/synonyms") =>              hashset!{"settings.get", "settings.*", "*"},
-            ("DELETE",  "/indexes/products/settings") =>                       hashset!{"settings.update", "settings.*", "*"},
-            ("PATCH",   "/indexes/products/settings") =>                       hashset!{"settings.update", "settings.*", "*"},
-            ("PATCH",   "/indexes/products/settings/typo-tolerance") =>        hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/displayed-attributes") =>  hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/distinct-attribute") =>    hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/filterable-attributes") => hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/ranking-rules") =>         hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/searchable-attributes") => hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/sortable-attributes") =>   hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/stop-words") =>            hashset!{"settings.update", "settings.*", "*"},
-            ("PUT",     "/indexes/products/settings/synonyms") =>              hashset!{"settings.update", "settings.*", "*"},
-            ("GET",     "/indexes/products/stats") =>                          hashset!{"stats.get", "stats.*", "*"},
-            ("GET",     "/stats") =>                                           hashset!{"stats.get", "stats.*", "*"},
-            ("POST",    "/dumps") =>                                           hashset!{"dumps.create", "dumps.*", "*"},
+            ("POST",    "/indexes/products/documents") =>                      hashset!{"documents.add", "*"},
+            ("GET",     "/indexes/products/documents") =>                      hashset!{"documents.get", "*"},
+            ("GET",     "/indexes/products/documents/0") =>                    hashset!{"documents.get", "*"},
+            ("DELETE",  "/indexes/products/documents/0") =>                    hashset!{"documents.delete", "*"},
+            ("GET",     "/tasks") =>                                           hashset!{"tasks.get", "*"},
+            ("GET",     "/tasks?indexUid=products") =>                         hashset!{"tasks.get", "*"},
+            ("GET",     "/tasks/0") =>                                         hashset!{"tasks.get", "*"},
+            ("PATCH",   "/indexes/products/") =>                               hashset!{"indexes.update", "*"},
+            ("GET",     "/indexes/products/") =>                               hashset!{"indexes.get", "*"},
+            ("DELETE",  "/indexes/products/") =>                               hashset!{"indexes.delete", "*"},
+            ("POST",    "/indexes") =>                                         hashset!{"indexes.create", "*"},
+            ("GET",     "/indexes") =>                                         hashset!{"indexes.get", "*"},
+            ("GET",     "/indexes/products/settings") =>                       hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/displayed-attributes") =>  hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/distinct-attribute") =>    hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/filterable-attributes") => hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/ranking-rules") =>         hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/searchable-attributes") => hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/sortable-attributes") =>   hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/stop-words") =>            hashset!{"settings.get", "*"},
+            ("GET",     "/indexes/products/settings/synonyms") =>              hashset!{"settings.get", "*"},
+            ("DELETE",  "/indexes/products/settings") =>                       hashset!{"settings.update", "*"},
+            ("PATCH",   "/indexes/products/settings") =>                       hashset!{"settings.update", "*"},
+            ("PATCH",   "/indexes/products/settings/typo-tolerance") =>        hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/displayed-attributes") =>  hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/distinct-attribute") =>    hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/filterable-attributes") => hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/ranking-rules") =>         hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/searchable-attributes") => hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/sortable-attributes") =>   hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/stop-words") =>            hashset!{"settings.update", "*"},
+            ("PUT",     "/indexes/products/settings/synonyms") =>              hashset!{"settings.update", "*"},
+            ("GET",     "/indexes/products/stats") =>                          hashset!{"stats.get", "*"},
+            ("GET",     "/stats") =>                                           hashset!{"stats.get", "*"},
+            ("POST",    "/dumps") =>                                           hashset!{"dumps.create", "*"},
             ("GET",     "/version") =>                                         hashset!{"version", "*"},
             ("PATCH",   "/keys/mykey/") =>                                     hashset!{"keys.update", "*"},
             ("GET",     "/keys/mykey/") =>                                     hashset!{"keys.get", "*"},

meilisearch-http/tests/auth/tenant_token.rs

@@ -115,7 +115,7 @@ static REFUSED_KEYS: Lazy<Vec<Value>> = Lazy::new(|| {
     ]
 });
 
-macro_rules! compute_authorized_search {
+macro_rules! compute_autorized_search {
     ($tenant_tokens:expr, $filter:expr, $expected_count:expr) => {
         let mut server = Server::new_auth().await;
         server.use_admin_key("MASTER_KEY").await;
@@ -251,7 +251,7 @@ async fn search_authorized_simple_token() {
         },
     ];
 
-    compute_authorized_search!(tenant_tokens, {}, 5);
+    compute_autorized_search!(tenant_tokens, {}, 5);
 }
 
 #[actix_rt::test]
@@ -305,7 +305,7 @@ async fn search_authorized_filter_token() {
         },
     ];
 
-    compute_authorized_search!(tenant_tokens, {}, 3);
+    compute_autorized_search!(tenant_tokens, {}, 3);
 }
 
 #[actix_rt::test]
@@ -359,7 +359,7 @@ async fn filter_search_authorized_filter_token() {
         },
     ];
 
-    compute_authorized_search!(tenant_tokens, "color = yellow", 1);
+    compute_autorized_search!(tenant_tokens, "color = yellow", 1);
 }
 
 #[actix_rt::test]

meilisearch-http/tests/common/index.rs

@@ -1,5 +1,4 @@
 use std::{
-    fmt::Write,
     panic::{catch_unwind, resume_unwind, UnwindSafe},
     time::Duration,
 };
@@ -119,10 +118,10 @@ impl Index<'_> {
     pub async fn filtered_tasks(&self, type_: &[&str], status: &[&str]) -> (Value, StatusCode) {
         let mut url = format!("/tasks?indexUid={}", self.uid);
         if !type_.is_empty() {
-            let _ = write!(url, "&type={}", type_.join(","));
+            url += &format!("&type={}", type_.join(","));
         }
         if !status.is_empty() {
-            let _ = write!(url, "&status={}", status.join(","));
+            url += &format!("&status={}", status.join(","));
         }
         self.service.get(url).await
     }
@@ -134,7 +133,7 @@ impl Index<'_> {
     ) -> (Value, StatusCode) {
         let mut url = format!("/indexes/{}/documents/{}", encode(self.uid.as_ref()), id);
         if let Some(fields) = options.and_then(|o| o.fields) {
-            let _ = write!(url, "?fields={}", fields.join(","));
+            url.push_str(&format!("?fields={}", fields.join(",")));
         }
         self.service.get(url).await
     }
@@ -142,15 +141,15 @@ impl Index<'_> {
     pub async fn get_all_documents(&self, options: GetAllDocumentsOptions) -> (Value, StatusCode) {
         let mut url = format!("/indexes/{}/documents?", encode(self.uid.as_ref()));
         if let Some(limit) = options.limit {
-            let _ = write!(url, "limit={}&", limit);
+            url.push_str(&format!("limit={}&", limit));
         }
 
         if let Some(offset) = options.offset {
-            let _ = write!(url, "offset={}&", offset);
+            url.push_str(&format!("offset={}&", offset));
         }
 
         if let Some(attributes_to_retrieve) = options.attributes_to_retrieve {
-            let _ = write!(url, "fields={}&", attributes_to_retrieve.join(","));
+            url.push_str(&format!("fields={}&", attributes_to_retrieve.join(",")));
         }
 
         self.service.get(url).await
@@ -222,7 +221,7 @@ impl Index<'_> {
     }
 
     pub async fn search_get(&self, query: Value) -> (Value, StatusCode) {
-        let params = yaup::to_string(&query).unwrap();
+        let params = serde_url_params::to_string(&query).unwrap();
         let url = format!("/indexes/{}/search?{}", encode(self.uid.as_ref()), params);
         self.service.get(url).await
     }

meilisearch-http/tests/documents/add_documents.rs

@@ -326,7 +326,7 @@ async fn error_add_malformed_json_documents() {
     assert_eq!(
         response["message"],
         json!(
-            r#"The `json` payload provided is malformed. `Couldn't serialize document value: invalid type: string "0123456789012345678901234567...890123456789", expected a documents, or a sequence of documents. at line 1 column 102`."#
+            r#"The `json` payload provided is malformed. `Couldn't serialize document value: invalid type: string "0123456789012345678901234567...7890123456789", expected a document, or a sequence of documents. at line 1 column 102`."#
         )
     );
     assert_eq!(response["code"], json!("malformed_payload"));
@@ -349,9 +349,7 @@ async fn error_add_malformed_json_documents() {
     assert_eq!(status_code, 400);
     assert_eq!(
         response["message"],
-        json!(
-            r#"The `json` payload provided is malformed. `Couldn't serialize document value: invalid type: string "0123456789012345678901234567...90123456789m", expected a documents, or a sequence of documents. at line 1 column 103`."#
-        )
+        json!("The `json` payload provided is malformed. `Couldn't serialize document value: invalid type: string \"0123456789012345678901234567...890123456789m\", expected a document, or a sequence of documents. at line 1 column 103`.")
     );
     assert_eq!(response["code"], json!("malformed_payload"));
     assert_eq!(response["type"], json!("invalid_request"));
@@ -388,7 +386,7 @@ async fn error_add_malformed_ndjson_documents() {
     assert_eq!(
         response["message"],
         json!(
-            r#"The `ndjson` payload provided is malformed. `Couldn't serialize document value: key must be a string at line 1 column 2`."#
+            r#"The `ndjson` payload provided is malformed. `Couldn't serialize document value: key must be a string at line 2 column 2`."#
         )
     );
     assert_eq!(response["code"], json!("malformed_payload"));
@@ -411,9 +409,7 @@ async fn error_add_malformed_ndjson_documents() {
     assert_eq!(status_code, 400);
     assert_eq!(
         response["message"],
-        json!(
-            r#"The `ndjson` payload provided is malformed. `Couldn't serialize document value: key must be a string at line 1 column 2`."#
-        )
+        json!("The `ndjson` payload provided is malformed. `Couldn't serialize document value: key must be a string at line 2 column 2`.")
     );
     assert_eq!(response["code"], json!("malformed_payload"));
     assert_eq!(response["type"], json!("invalid_request"));
@@ -625,7 +621,7 @@ async fn add_documents_no_index_creation() {
         OffsetDateTime::parse(response["enqueuedAt"].as_str().unwrap(), &Rfc3339).unwrap();
     assert!(processed_at > enqueued_at);
 
-    // index was created, and primary key was inferred.
+    // index was created, and primary key was infered.
     let (response, code) = index.get().await;
     assert_eq!(code, 200);
     assert_eq!(response["primaryKey"], "id");
@@ -1020,7 +1016,7 @@ async fn add_documents_invalid_geo_field() {
     index.wait_task(2).await;
     let (response, code) = index.get_task(2).await;
     assert_eq!(code, 200);
-    assert_eq!(response["status"], "succeeded");
+    assert_eq!(response["status"], "failed");
 }
 
 #[actix_rt::test]

meilisearch-http/tests/dumps/mod.rs

@@ -61,7 +61,7 @@ async fn import_dump_v2_movie_raw() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({"displayedAttributes": ["*"], "searchableAttributes": ["*"], "filterableAttributes": [], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({"displayedAttributes": ["*"], "searchableAttributes": ["*"], "filterableAttributes": [], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -125,7 +125,7 @@ async fn import_dump_v2_movie_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({ "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": ["of", "the"], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": { "oneTypo": 5, "twoTypos": 9 }, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({ "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": ["of", "the"], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": { "oneTypo": 5, "twoTypos": 9 }, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -189,7 +189,7 @@ async fn import_dump_v2_rubygems_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({"displayedAttributes": ["name", "summary", "description", "version", "total_downloads"], "searchableAttributes": ["name", "summary"], "filterableAttributes": ["version"], "sortableAttributes": [], "rankingRules": ["typo", "words", "fame:desc", "proximity", "attribute", "exactness", "total_downloads:desc"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 }})
+        json!({"displayedAttributes": ["name", "summary", "description", "version", "total_downloads"], "searchableAttributes": ["name", "summary"], "filterableAttributes": ["version"], "sortableAttributes": [], "rankingRules": ["typo", "words", "fame:desc", "proximity", "attribute", "exactness", "total_downloads:desc"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 }})
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -253,7 +253,7 @@ async fn import_dump_v3_movie_raw() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({"displayedAttributes": ["*"], "searchableAttributes": ["*"], "filterableAttributes": [], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({"displayedAttributes": ["*"], "searchableAttributes": ["*"], "filterableAttributes": [], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -317,7 +317,7 @@ async fn import_dump_v3_movie_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({ "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": ["of", "the"], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": { "oneTypo": 5, "twoTypos": 9 }, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({ "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": ["of", "the"], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": { "oneTypo": 5, "twoTypos": 9 }, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -381,7 +381,7 @@ async fn import_dump_v3_rubygems_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({"displayedAttributes": ["name", "summary", "description", "version", "total_downloads"], "searchableAttributes": ["name", "summary"], "filterableAttributes": ["version"], "sortableAttributes": [], "rankingRules": ["typo", "words", "fame:desc", "proximity", "attribute", "exactness", "total_downloads:desc"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({"displayedAttributes": ["name", "summary", "description", "version", "total_downloads"], "searchableAttributes": ["name", "summary"], "filterableAttributes": ["version"], "sortableAttributes": [], "rankingRules": ["typo", "words", "fame:desc", "proximity", "attribute", "exactness", "total_downloads:desc"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -445,7 +445,7 @@ async fn import_dump_v4_movie_raw() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({ "displayedAttributes": ["*"], "searchableAttributes": ["*"], "filterableAttributes": [], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({ "displayedAttributes": ["*"], "searchableAttributes": ["*"], "filterableAttributes": [], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -509,7 +509,7 @@ async fn import_dump_v4_movie_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({ "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": ["of", "the"], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": { "oneTypo": 5, "twoTypos": 9 }, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({ "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "sortableAttributes": [], "rankingRules": ["words", "typo", "proximity", "attribute", "exactness"], "stopWords": ["of", "the"], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": { "oneTypo": 5, "twoTypos": 9 }, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;
@@ -573,7 +573,7 @@ async fn import_dump_v4_rubygems_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         settings,
-        json!({ "displayedAttributes": ["name", "summary", "description", "version", "total_downloads"], "searchableAttributes": ["name", "summary"], "filterableAttributes": ["version"], "sortableAttributes": [], "rankingRules": ["typo", "words", "fame:desc", "proximity", "attribute", "exactness", "total_downloads:desc"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "maxTotalHits": 1000 } })
+        json!({ "displayedAttributes": ["name", "summary", "description", "version", "total_downloads"], "searchableAttributes": ["name", "summary"], "filterableAttributes": ["version"], "sortableAttributes": [], "rankingRules": ["typo", "words", "fame:desc", "proximity", "attribute", "exactness", "total_downloads:desc"], "stopWords": [], "synonyms": {}, "distinctAttribute": null, "typoTolerance": {"enabled": true, "minWordSizeForTypos": {"oneTypo": 5, "twoTypos": 9}, "disableOnWords": [], "disableOnAttributes": [] }, "faceting": { "maxValuesPerFacet": 100 }, "pagination": { "limitedTo": 1000 } })
     );
 
     let (tasks, code) = index.list_tasks().await;

meilisearch-http/tests/search/errors.rs

@@ -45,18 +45,26 @@ async fn search_invalid_highlight_and_crop_tags() {
 
     for field in fields {
         // object
-        let (response, code) = index
-            .search_post(json!({field.to_string(): {"marker": "<crop>"}}))
+        index
+            .search(
+                json!({field.to_string(): {"marker": "<crop>"}}),
+                |response, code| {
+                    assert_eq!(code, 400, "field {} passing object: {}", &field, response);
+                    assert_eq!(response["code"], "bad_request");
+                },
+            )
             .await;
-        assert_eq!(code, 400, "field {} passing object: {}", &field, response);
-        assert_eq!(response["code"], "bad_request");
 
         // array
-        let (response, code) = index
-            .search_post(json!({field.to_string(): ["marker", "<crop>"]}))
+        index
+            .search(
+                json!({field.to_string(): ["marker", "<crop>"]}),
+                |response, code| {
+                    assert_eq!(code, 400, "field {} passing array: {}", &field, response);
+                    assert_eq!(response["code"], "bad_request");
+                },
+            )
             .await;
-        assert_eq!(code, 400, "field {} passing array: {}", &field, response);
-        assert_eq!(response["code"], "bad_request");
     }
 }
 
@@ -107,7 +115,7 @@ async fn filter_invalid_syntax_array() {
         "link": "https://docs.meilisearch.com/errors#invalid_filter"
     });
     index
-        .search(json!({"filter": ["title & Glass"]}), |response, code| {
+        .search(json!({"filter": [["title & Glass"]]}), |response, code| {
             assert_eq!(response, expected_response);
             assert_eq!(code, 400);
         })
@@ -164,7 +172,7 @@ async fn filter_invalid_attribute_array() {
         "link": "https://docs.meilisearch.com/errors#invalid_filter"
     });
     index
-        .search(json!({"filter": ["many = Glass"]}), |response, code| {
+        .search(json!({"filter": [["many = Glass"]]}), |response, code| {
             assert_eq!(response, expected_response);
             assert_eq!(code, 400);
         })
@@ -218,7 +226,7 @@ async fn filter_reserved_geo_attribute_array() {
         "link": "https://docs.meilisearch.com/errors#invalid_filter"
     });
     index
-        .search(json!({"filter": ["_geo = Glass"]}), |response, code| {
+        .search(json!({"filter": [["_geo = Glass"]]}), |response, code| {
             assert_eq!(response, expected_response);
             assert_eq!(code, 400);
         })
@@ -273,7 +281,7 @@ async fn filter_reserved_attribute_array() {
     });
     index
         .search(
-            json!({"filter": ["_geoDistance = Glass"]}),
+            json!({"filter": [["_geoDistance = Glass"]]}),
             |response, code| {
                 assert_eq!(response, expected_response);
                 assert_eq!(code, 400);

meilisearch-http/tests/search/formatted.rs

@@ -15,100 +15,85 @@ async fn formatted_contain_wildcard() {
     index.add_documents(documents, None).await;
     index.wait_task(1).await;
 
-    index.search(json!({ "q": "pesti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "showMatchesPosition": true }),
-        |response, code|
-        {
-            assert_eq!(code, 200, "{}", response);
-            assert_eq!(
-                response["hits"][0],
-                json!({
-                    "_formatted": {
-                        "id": "852",
-                        "cattos": "<em>pesti</em>",
-                    },
-                    "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
-                })
-            );
-        }
-    )
-    .await;
-
-    index
-        .search(
-            json!({ "q": "pesti", "attributesToRetrieve": ["*"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                        "cattos": "pesti",
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "showMatchesPosition": true }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "_formatted": {
+                "id": "852",
+                "cattos": "<em>pesti</em>",
+            },
+            "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
+        })
+    );
 
-    index
-        .search(
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": ["*"] }))
+        .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "cattos": "pesti",
+        })
+    );
+
+    let (response, code) = index
+        .search_post(
             json!({ "q": "pesti", "attributesToRetrieve": ["*"], "attributesToHighlight": ["id"], "showMatchesPosition": true }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                        "cattos": "pesti",
-                        "_formatted": {
-                            "id": "852",
-                            "cattos": "pesti",
-                        },
-                        "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
-                    })
-                );
-            }
         )
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "cattos": "pesti",
+            "_formatted": {
+                "id": "852",
+                "cattos": "pesti",
+            },
+            "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
+        })
+    );
 
-    index
-        .search(
+    let (response, code) = index
+        .search_post(
             json!({ "q": "pesti", "attributesToRetrieve": ["*"], "attributesToCrop": ["*"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                        "cattos": "pesti",
-                        "_formatted": {
-                            "id": "852",
-                            "cattos": "pesti",
-                        }
-                    })
-                );
-            },
         )
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "cattos": "pesti",
+            "_formatted": {
+                "id": "852",
+                "cattos": "pesti",
+            }
+        })
+    );
 
-    index
-        .search(
-            json!({ "q": "pesti", "attributesToCrop": ["*"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                        "cattos": "pesti",
-                        "_formatted": {
-                            "id": "852",
-                            "cattos": "pesti",
-                        }
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToCrop": ["*"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "cattos": "pesti",
+            "_formatted": {
+                "id": "852",
+                "cattos": "pesti",
+            }
+        })
+    );
 }
 
 #[actix_rt::test]
@@ -120,122 +105,108 @@ async fn format_nested() {
     index.add_documents(documents, None).await;
     index.wait_task(0).await;
 
-    index
-        .search(
-            json!({ "q": "pesti", "attributesToRetrieve": ["doggos"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "doggos": [
-                            {
-                                "name": "bobby",
-                                "age": 2,
-                            },
-                            {
-                                "name": "buddy",
-                                "age": 4,
-                            },
-                        ],
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": ["doggos"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "doggos": [
+                {
+                    "name": "bobby",
+                    "age": 2,
+                },
+                {
+                    "name": "buddy",
+                    "age": 4,
+                },
+            ],
+        })
+    );
 
-    index
-        .search(
-            json!({ "q": "pesti", "attributesToRetrieve": ["doggos.name"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "doggos": [
-                            {
-                                "name": "bobby",
-                            },
-                            {
-                                "name": "buddy",
-                            },
-                        ],
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": ["doggos.name"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "doggos": [
+                {
+                    "name": "bobby",
+                },
+                {
+                    "name": "buddy",
+                },
+            ],
+        })
+    );
 
-    index
-        .search(
+    let (response, code) = index
+        .search_post(
             json!({ "q": "bobby", "attributesToRetrieve": ["doggos.name"], "showMatchesPosition": true }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "doggos": [
-                            {
-                                "name": "bobby",
-                            },
-                            {
-                                "name": "buddy",
-                            },
-                        ],
-                        "_matchesPosition": {"doggos.name": [{"start": 0, "length": 5}]},
-                    })
-                );
-            }
         )
         .await;
-
-    index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.name"] }),
-        |response, code| {
-            assert_eq!(code, 200, "{}", response);
-            assert_eq!(
-                response["hits"][0],
-                json!({
-                    "_formatted": {
-                        "doggos": [
-                            {
-                                "name": "bobby",
-                            },
-                            {
-                                "name": "buddy",
-                            },
-                        ],
-                    },
-                })
-            );
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "doggos": [
+                {
+                    "name": "bobby",
+                },
+                {
+                    "name": "buddy",
+                },
+            ],
+            "_matchesPosition": {"doggos.name": [{"start": 0, "length": 5}]},
         })
-        .await;
+    );
 
-    index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToCrop": ["doggos.name"] }),
-        |response, code| {
-            assert_eq!(code, 200, "{}", response);
-            assert_eq!(
-                response["hits"][0],
-                json!({
-                    "_formatted": {
-                        "doggos": [
-                            {
-                                "name": "bobby",
-                            },
-                            {
-                                "name": "buddy",
-                            },
-                        ],
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.name"] }))
+        .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "_formatted": {
+                "doggos": [
+                    {
+                        "name": "bobby",
                     },
-                })
-            );
+                    {
+                        "name": "buddy",
+                    },
+                ],
+            },
         })
-        .await;
+    );
 
-    index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": ["doggos.name"], "attributesToHighlight": ["doggos.age"] }),
-        |response, code| {
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToCrop": ["doggos.name"] }))
+        .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "_formatted": {
+                "doggos": [
+                    {
+                        "name": "bobby",
+                    },
+                    {
+                        "name": "buddy",
+                    },
+                ],
+            },
+        })
+    );
+
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": ["doggos.name"], "attributesToHighlight": ["doggos.age"] }))
+        .await;
     assert_eq!(code, 200, "{}", response);
     assert_eq!(
         response["hits"][0],
@@ -262,13 +233,11 @@ async fn format_nested() {
             },
         })
     );
-        })
-        .await;
 
-    index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.age"], "attributesToCrop": ["doggos.name"] }),
-        |response, code| {
-                assert_eq!(code, 200, "{}", response);
+    let (response, code) = index
+        .search_post(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.age"], "attributesToCrop": ["doggos.name"] }))
+        .await;
+    assert_eq!(code, 200, "{}", response);
     assert_eq!(
         response["hits"][0],
         json!({
@@ -286,9 +255,6 @@ async fn format_nested() {
             },
         })
     );
-            }
-        )
-        .await;
 }
 
 #[actix_rt::test]
@@ -305,9 +271,9 @@ async fn displayedattr_2_smol() {
     index.add_documents(documents, None).await;
     index.wait_task(1).await;
 
-    index
-        .search(json!({ "attributesToRetrieve": ["father", "id"], "attributesToHighlight": ["mother"], "attributesToCrop": ["cattos"] }),
-        |response, code| {
+    let (response, code) = index
+        .search_post(json!({ "attributesToRetrieve": ["father", "id"], "attributesToHighlight": ["mother"], "attributesToCrop": ["cattos"] }))
+        .await;
     assert_eq!(code, 200, "{}", response);
     assert_eq!(
         response["hits"][0],
@@ -315,157 +281,119 @@ async fn displayedattr_2_smol() {
             "id": 852,
         })
     );
+
+    let (response, code) = index
+        .search_post(json!({ "attributesToRetrieve": ["id"] }))
+        .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
         })
-        .await;
+    );
 
-    index
-        .search(
-            json!({ "attributesToRetrieve": ["id"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "attributesToHighlight": ["id"] }))
         .await;
-
-    index
-        .search(
-            json!({ "attributesToHighlight": ["id"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                        "_formatted": {
-                            "id": "852",
-                        }
-                    })
-                );
-            },
-        )
-        .await;
-
-    index
-        .search(json!({ "attributesToCrop": ["id"] }), |response, code| {
-            assert_eq!(code, 200, "{}", response);
-            assert_eq!(
-                response["hits"][0],
-                json!({
-                    "id": 852,
-                    "_formatted": {
-                        "id": "852",
-                    }
-                })
-            );
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "_formatted": {
+                "id": "852",
+            }
         })
-        .await;
+    );
 
-    index
-        .search(
-            json!({ "attributesToHighlight": ["id"], "attributesToCrop": ["id"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                        "_formatted": {
-                            "id": "852",
-                        }
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "attributesToCrop": ["id"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "_formatted": {
+                "id": "852",
+            }
+        })
+    );
 
-    index
-        .search(
-            json!({ "attributesToHighlight": ["cattos"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "attributesToHighlight": ["id"], "attributesToCrop": ["id"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+            "_formatted": {
+                "id": "852",
+            }
+        })
+    );
 
-    index
-        .search(
-            json!({ "attributesToCrop": ["cattos"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "id": 852,
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "attributesToHighlight": ["cattos"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+        })
+    );
 
-    index
-        .search(
-            json!({ "attributesToRetrieve": ["cattos"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(response["hits"][0], json!({}));
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "attributesToCrop": ["cattos"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "id": 852,
+        })
+    );
 
-    index
-        .search(
-            json!({ "attributesToRetrieve": ["cattos"], "attributesToHighlight": ["cattos"], "attributesToCrop": ["cattos"] }),
-            |response, code| {
+    let (response, code) = index
+        .search_post(json!({ "attributesToRetrieve": ["cattos"] }))
+        .await;
     assert_eq!(code, 200, "{}", response);
     assert_eq!(response["hits"][0], json!({}));
 
+    let (response, code) = index
+        .search_post(
+            json!({ "attributesToRetrieve": ["cattos"], "attributesToHighlight": ["cattos"], "attributesToCrop": ["cattos"] }),
+        )
+        .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(response["hits"][0], json!({}));
+
+    let (response, code) = index
+        .search_post(json!({ "attributesToRetrieve": ["cattos"], "attributesToHighlight": ["id"] }))
+        .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "_formatted": {
+                "id": "852",
             }
-        )
-        .await;
+        })
+    );
 
-    index
-        .search(
-            json!({ "attributesToRetrieve": ["cattos"], "attributesToHighlight": ["id"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "_formatted": {
-                            "id": "852",
-                        }
-                    })
-                );
-            },
-        )
-        .await;
-
-    index
-        .search(
-            json!({ "attributesToRetrieve": ["cattos"], "attributesToCrop": ["id"] }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                assert_eq!(
-                    response["hits"][0],
-                    json!({
-                        "_formatted": {
-                            "id": "852",
-                        }
-                    })
-                );
-            },
-        )
+    let (response, code) = index
+        .search_post(json!({ "attributesToRetrieve": ["cattos"], "attributesToCrop": ["id"] }))
         .await;
+    assert_eq!(code, 200, "{}", response);
+    assert_eq!(
+        response["hits"][0],
+        json!({
+            "_formatted": {
+                "id": "852",
+            }
+        })
+    );
 }

meilisearch-http/tests/search/mod.rs

@@ -1,4 +1,4 @@
-// This modules contains all the test concerning search. Each particular feature of the search
+// This modules contains all the test concerning search. Each particular feture of the search
 // should be tested in its own module to isolate tests and keep the tests readable.
 
 mod errors;
@@ -567,7 +567,7 @@ async fn placeholder_search_is_hard_limited() {
         .await;
 
     index
-        .update_settings(json!({ "pagination": { "maxTotalHits": 10_000 } }))
+        .update_settings(json!({ "pagination": { "limitedTo": 10_000 } }))
         .await;
     index.wait_task(1).await;
 
@@ -636,7 +636,7 @@ async fn search_is_hard_limited() {
         .await;
 
     index
-        .update_settings(json!({ "pagination": { "maxTotalHits": 10_000 } }))
+        .update_settings(json!({ "pagination": { "limitedTo": 10_000 } }))
         .await;
     index.wait_task(1).await;
 
@@ -708,9 +708,7 @@ async fn faceting_max_values_per_facet() {
             }),
             |response, code| {
                 assert_eq!(code, 200, "{}", response);
-                let numbers = dbg!(&response)["facetDistribution"]["number"]
-                    .as_object()
-                    .unwrap();
+                let numbers = &response["facetDistribution"]["number"].as_object().unwrap();
                 assert_eq!(numbers.len(), 10_000);
             },
         )

meilisearch-http/tests/settings/get_settings.rs

@@ -27,13 +27,7 @@ static DEFAULT_SETTINGS_VALUES: Lazy<HashMap<&'static str, Value>> = Lazy::new(|
     map.insert(
         "faceting",
         json!({
-            "maxValuesPerFacet": json!(100),
-        }),
-    );
-    map.insert(
-        "pagination",
-        json!({
-            "maxTotalHits": json!(1000),
+            "maxValuesByFacet": json!(100),
         }),
     );
     map
@@ -82,7 +76,7 @@ async fn get_settings() {
     assert_eq!(
         settings["pagination"],
         json!({
-            "maxTotalHits": 1000,
+            "limitedTo": 1000,
         })
     );
 }
@@ -212,7 +206,7 @@ async fn error_update_setting_unexisting_index_invalid_uid() {
 }
 
 macro_rules! test_setting_routes {
-    ($($setting:ident $write_method:ident), *) => {
+    ($($setting:ident), *) => {
         $(
             mod $setting {
                 use crate::common::Server;
@@ -238,7 +232,7 @@ macro_rules! test_setting_routes {
                         .chars()
                         .map(|c| if c == '_' { '-' } else { c })
                         .collect::<String>());
-                    let (response, code) = server.service.$write_method(url, serde_json::Value::Null).await;
+                    let (response, code) = server.service.put(url, serde_json::Value::Null).await;
                     assert_eq!(code, 202, "{}", response);
                     server.index("").wait_task(0).await;
                     let (response, code) = server.index("test").get().await;
@@ -282,15 +276,13 @@ macro_rules! test_setting_routes {
 }
 
 test_setting_routes!(
-    filterable_attributes put,
-    displayed_attributes put,
-    searchable_attributes put,
-    distinct_attribute put,
-    stop_words put,
-    ranking_rules put,
-    synonyms put,
-    pagination patch,
-    faceting patch
+    filterable_attributes,
+    displayed_attributes,
+    searchable_attributes,
+    distinct_attribute,
+    stop_words,
+    ranking_rules,
+    synonyms
 );
 
 #[actix_rt::test]

meilisearch-http/tests/tasks/mod.rs

@@ -39,7 +39,7 @@ async fn get_task_status() {
     index.wait_task(0).await;
     let (_response, code) = index.get_task(1).await;
     assert_eq!(code, 200);
-    // TODO check response format, as per #48
+    // TODO check resonse format, as per #48
 }
 
 #[actix_rt::test]

meilisearch-lib/Cargo.toml

@@ -1,15 +1,17 @@
 [package]
 name = "meilisearch-lib"
-version = "0.28.1"
+version = "0.28.0"
 edition = "2021"
 
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
 [dependencies]
 actix-web = { version = "4.0.1", default-features = false }
 anyhow = { version = "1.0.56", features = ["backtrace"] }
 async-stream = "0.3.3"
 async-trait = "0.1.52"
 atomic_refcell = "0.1.8"
-byte-unit = { version = "4.0.14", default-features = false, features = ["std", "serde"] }
+byte-unit = { version = "4.0.14", default-features = false, features = ["std"] }
 bytes = "1.1.0"
 clap = { version = "3.1.6", features = ["derive", "env"] }
 crossbeam-channel = "0.5.2"
@@ -28,7 +30,7 @@ lazy_static = "1.4.0"
 log = "0.4.14"
 meilisearch-auth = { path = "../meilisearch-auth" }
 meilisearch-types = { path = "../meilisearch-types" }
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.31.2" }
+milli = { path = "../../milli/milli" }
 mime = "0.3.16"
 num_cpus = "1.13.1"
 obkv = "0.2.0"
@@ -51,7 +53,7 @@ tempfile = "3.3.0"
 thiserror = "1.0.30"
 time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] }
 tokio = { version = "1.17.0", features = ["full"] }
-uuid = { version = "1.1.2", features = ["serde", "v4"] }
+uuid = { version = "0.8.2", features = ["serde", "v4"] }
 walkdir = "2.3.2"
 whoami = { version = "1.2.1", optional = true }
 

meilisearch-lib/src/document_formats.rs

@@ -1,129 +0,0 @@
-use std::borrow::Borrow;
-use std::fmt::{self, Debug, Display};
-use std::io::{self, BufRead, BufReader, BufWriter, Cursor, Read, Seek, Write};
-
-use meilisearch_types::error::{Code, ErrorCode};
-use meilisearch_types::internal_error;
-use milli::documents::DocumentBatchBuilder;
-
-type Result<T> = std::result::Result<T, DocumentFormatError>;
-
-#[derive(Debug)]
-pub enum PayloadType {
-    Ndjson,
-    Json,
-    Csv,
-}
-
-impl fmt::Display for PayloadType {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            PayloadType::Ndjson => write!(f, "ndjson"),
-            PayloadType::Json => write!(f, "json"),
-            PayloadType::Csv => write!(f, "csv"),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum DocumentFormatError {
-    Internal(Box<dyn std::error::Error + Send + Sync + 'static>),
-    MalformedPayload(Box<milli::documents::Error>, PayloadType),
-}
-
-impl Display for DocumentFormatError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Internal(e) => write!(f, "An internal error has occurred: `{}`.", e),
-            Self::MalformedPayload(me, b) => match me.borrow() {
-                milli::documents::Error::JsonError(se) => {
-                    // https://github.com/meilisearch/meilisearch/issues/2107
-                    // The user input maybe insanely long. We need to truncate it.
-                    let mut serde_msg = se.to_string();
-                    let ellipsis = "...";
-                    if serde_msg.len() > 100 + ellipsis.len() {
-                        serde_msg.replace_range(50..serde_msg.len() - 85, ellipsis);
-                    }
-
-                    write!(
-                        f,
-                        "The `{}` payload provided is malformed. `Couldn't serialize document value: {}`.",
-                        b, serde_msg
-                )
-                }
-                _ => write!(f, "The `{}` payload provided is malformed: `{}`.", b, me),
-            },
-        }
-    }
-}
-
-impl std::error::Error for DocumentFormatError {}
-
-impl From<(PayloadType, milli::documents::Error)> for DocumentFormatError {
-    fn from((ty, error): (PayloadType, milli::documents::Error)) -> Self {
-        match error {
-            milli::documents::Error::Io(e) => Self::Internal(Box::new(e)),
-            e => Self::MalformedPayload(Box::new(e), ty),
-        }
-    }
-}
-
-impl ErrorCode for DocumentFormatError {
-    fn error_code(&self) -> Code {
-        match self {
-            DocumentFormatError::Internal(_) => Code::Internal,
-            DocumentFormatError::MalformedPayload(_, _) => Code::MalformedPayload,
-        }
-    }
-}
-
-internal_error!(DocumentFormatError: io::Error);
-
-/// reads csv from input and write an obkv batch to writer.
-pub fn read_csv(input: impl Read, writer: impl Write + Seek) -> Result<usize> {
-    let writer = BufWriter::new(writer);
-    let builder =
-        DocumentBatchBuilder::from_csv(input, writer).map_err(|e| (PayloadType::Csv, e))?;
-
-    let count = builder.finish().map_err(|e| (PayloadType::Csv, e))?;
-
-    Ok(count)
-}
-
-/// reads jsonl from input and write an obkv batch to writer.
-pub fn read_ndjson(input: impl Read, writer: impl Write + Seek) -> Result<usize> {
-    let mut reader = BufReader::new(input);
-    let writer = BufWriter::new(writer);
-
-    let mut builder = DocumentBatchBuilder::new(writer).map_err(|e| (PayloadType::Ndjson, e))?;
-    let mut buf = String::new();
-
-    while reader.read_line(&mut buf)? > 0 {
-        // skip empty lines
-        if buf == "\n" {
-            buf.clear();
-            continue;
-        }
-        builder
-            .extend_from_json(Cursor::new(&buf.as_bytes()))
-            .map_err(|e| (PayloadType::Ndjson, e))?;
-        buf.clear();
-    }
-
-    let count = builder.finish().map_err(|e| (PayloadType::Ndjson, e))?;
-
-    Ok(count)
-}
-
-/// reads json from input and write an obkv batch to writer.
-pub fn read_json(input: impl Read, writer: impl Write + Seek) -> Result<usize> {
-    let writer = BufWriter::new(writer);
-    let mut builder = DocumentBatchBuilder::new(writer).map_err(|e| (PayloadType::Json, e))?;
-    builder
-        .extend_from_json(input)
-        .map_err(|e| (PayloadType::Json, e))?;
-
-    let count = builder.finish().map_err(|e| (PayloadType::Json, e))?;
-
-    Ok(count)
-}

meilisearch-lib/src/dump/error.rs

@@ -11,11 +11,12 @@ pub enum DumpError {
     #[error("An internal error has occurred. `{0}`.")]
     Internal(Box<dyn std::error::Error + Send + Sync + 'static>),
     #[error("{0}")]
-    IndexResolver(#[from] IndexResolverError),
+    IndexResolver(#[from] Box<IndexResolverError>),
 }
 
 internal_error!(
     DumpError: milli::heed::Error,
+    IndexResolverError,
     std::io::Error,
     tokio::task::JoinError,
     tokio::sync::oneshot::error::RecvError,

meilisearch-lib/src/error.rs

@@ -32,7 +32,9 @@ impl ErrorCode for MilliError<'_> {
                     UserError::AttributeLimitReached => Code::MaxFieldsLimitExceeded,
                     UserError::InvalidFilter(_) => Code::Filter,
                     UserError::MissingDocumentId { .. } => Code::MissingDocumentId,
-                    UserError::InvalidDocumentId { .. } => Code::InvalidDocumentId,
+                    UserError::InvalidDocumentId { .. } | UserError::TooManyDocumentIds { .. } => {
+                        Code::InvalidDocumentId
+                    }
                     UserError::MissingPrimaryKey => Code::MissingPrimaryKey,
                     UserError::PrimaryKeyCannotBeChanged(_) => Code::PrimaryKeyAlreadyPresent,
                     UserError::SortRankingRuleMissing => Code::Sort,

meilisearch-lib/src/index/dump.rs

@@ -4,13 +4,13 @@ use std::path::Path;
 
 use anyhow::Context;
 use indexmap::IndexMap;
-use milli::documents::DocumentBatchReader;
+use milli::documents::DocumentsBatchReader;
 use milli::heed::{EnvOpenOptions, RoTxn};
 use milli::update::{IndexDocumentsConfig, IndexerConfig};
 use serde::{Deserialize, Serialize};
 
-use crate::document_formats::read_ndjson;
 use crate::index::updates::apply_settings_to_builder;
+use milli::documents::document_formats::read_ndjson;
 
 use super::error::Result;
 use super::{index::Index, Settings, Unchecked};
@@ -135,19 +135,20 @@ impl Index {
         if !empty {
             tmp_doc_file.seek(SeekFrom::Start(0))?;
 
-            let documents_reader = DocumentBatchReader::from_reader(tmp_doc_file)?;
+            let documents_reader = DocumentsBatchReader::from_reader(tmp_doc_file)?;
 
             //If the document file is empty, we don't perform the document addition, to prevent
             //a primary key error to be thrown.
             let config = IndexDocumentsConfig::default();
-            let mut builder = milli::update::IndexDocuments::new(
+            let builder = milli::update::IndexDocuments::new(
                 &mut txn,
                 &index,
                 indexer_config,
                 config,
                 |_| (),
             )?;
-            builder.add_documents(documents_reader)?;
+            let (builder, user_error) = builder.add_documents(documents_reader)?;
+            user_error?;
             builder.execute()?;
         }
 

meilisearch-lib/src/index/error.rs

@@ -40,6 +40,12 @@ impl ErrorCode for IndexError {
     }
 }
 
+impl From<milli::UserError> for IndexError {
+    fn from(error: milli::UserError) -> IndexError {
+        IndexError::Milli(error.into())
+    }
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum FacetError {
     #[error("Invalid syntax for the filter parameter: `expected {}, found: {1}`.", .0.join(", "))]

meilisearch-lib/src/index/index.rs

@@ -4,7 +4,6 @@ use std::marker::PhantomData;
 use std::ops::Deref;
 use std::path::Path;
 use std::sync::Arc;
-use walkdir::WalkDir;
 
 use fst::IntoStreamer;
 use milli::heed::{CompactionOption, EnvOpenOptions, RoTxn};
@@ -14,8 +13,9 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 use time::OffsetDateTime;
 use uuid::Uuid;
+use walkdir::WalkDir;
 
-use crate::index::search::DEFAULT_PAGINATION_MAX_TOTAL_HITS;
+use crate::index::search::DEFAULT_PAGINATION_LIMITED_TO;
 
 use super::error::IndexError;
 use super::error::Result;
@@ -202,9 +202,9 @@ impl Index {
         };
 
         let pagination = PaginationSettings {
-            max_total_hits: Setting::Set(
-                self.pagination_max_total_hits(txn)?
-                    .unwrap_or(DEFAULT_PAGINATION_MAX_TOTAL_HITS),
+            limited_to: Setting::Set(
+                self.pagination_limited_to(txn)?
+                    .unwrap_or(DEFAULT_PAGINATION_LIMITED_TO),
             ),
         };
 
@@ -245,11 +245,8 @@ impl Index {
         let fields_ids_map = self.fields_ids_map(&txn)?;
         let all_fields: Vec<_> = fields_ids_map.iter().map(|(id, _)| id).collect();
 
-        let iter = self.all_documents(&txn)?.skip(offset).take(limit);
-
         let mut documents = Vec::new();
-
-        for entry in iter {
+        for entry in self.all_documents(&txn)?.skip(offset).take(limit) {
             let (_id, obkv) = entry?;
             let document = obkv_to_json(&all_fields, &fields_ids_map, obkv)?;
             let document = match &attributes_to_retrieve {
@@ -302,7 +299,7 @@ impl Index {
     }
 
     pub fn size(&self) -> u64 {
-        WalkDir::new(self.inner.path())
+        WalkDir::new(self.path())
             .into_iter()
             .filter_map(|entry| entry.ok())
             .filter_map(|entry| entry.metadata().ok())
@@ -316,6 +313,7 @@ impl Index {
         dst.push("data.mdb");
         let _txn = self.write_txn()?;
         self.inner.copy_to_path(dst, CompactionOption::Enabled)?;
+
         Ok(())
     }
 }

meilisearch-lib/src/index/mod.rs

@@ -24,12 +24,12 @@ pub use test::MockIndex as Index;
 /// code for unit testing, in places where an index would normally be used.
 #[cfg(test)]
 pub mod test {
-    use std::path::Path;
-    use std::path::PathBuf;
+    use std::path::{Path, PathBuf};
     use std::sync::Arc;
 
-    use milli::update::IndexerConfig;
-    use milli::update::{DocumentAdditionResult, DocumentDeletionResult, IndexDocumentsMethod};
+    use milli::update::{
+        DocumentAdditionResult, DocumentDeletionResult, IndexDocumentsMethod, IndexerConfig,
+    };
     use nelson::Mocker;
     use uuid::Uuid;
 
@@ -162,7 +162,7 @@ pub mod test {
             primary_key: Option<String>,
             file_store: UpdateFileStore,
             contents: impl Iterator<Item = Uuid>,
-        ) -> Result<DocumentAdditionResult> {
+        ) -> Result<Vec<Result<DocumentAdditionResult>>> {
             match self {
                 MockIndex::Real(index) => {
                     index.update_documents(method, primary_key, file_store, contents)

meilisearch-lib/src/index/search.rs

@@ -29,7 +29,7 @@ pub const DEFAULT_HIGHLIGHT_POST_TAG: fn() -> String = || "</em>".to_string();
 
 /// The maximimum number of results that the engine
 /// will be able to return in one search call.
-pub const DEFAULT_PAGINATION_MAX_TOTAL_HITS: usize = 1000;
+pub const DEFAULT_PAGINATION_LIMITED_TO: usize = 1000;
 
 #[derive(Deserialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
@@ -91,14 +91,14 @@ impl Index {
             search.query(query);
         }
 
-        let max_total_hits = self
-            .pagination_max_total_hits(&rtxn)?
-            .unwrap_or(DEFAULT_PAGINATION_MAX_TOTAL_HITS);
+        let pagination_limited_to = self
+            .pagination_limited_to(&rtxn)?
+            .unwrap_or(DEFAULT_PAGINATION_LIMITED_TO);
 
         // Make sure that a user can't get more documents than the hard limit,
         // we align that on the offset too.
-        let offset = min(query.offset.unwrap_or(0), max_total_hits);
-        let limit = min(query.limit, max_total_hits.saturating_sub(offset));
+        let offset = min(query.offset.unwrap_or(0), pagination_limited_to);
+        let limit = min(query.limit, pagination_limited_to.saturating_sub(offset));
 
         search.offset(offset);
         search.limit(limit);

meilisearch-lib/src/index/updates.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use std::num::NonZeroUsize;
 
 use log::{debug, info, trace};
-use milli::documents::DocumentBatchReader;
+use milli::documents::DocumentsBatchReader;
 use milli::update::{
     DocumentAdditionResult, DocumentDeletionResult, IndexDocumentsConfig, IndexDocumentsMethod,
     Setting,
@@ -11,7 +11,7 @@ use milli::update::{
 use serde::{Deserialize, Serialize, Serializer};
 use uuid::Uuid;
 
-use super::error::Result;
+use super::error::{IndexError, Result};
 use super::index::{Index, IndexMeta};
 use crate::update_file_store::UpdateFileStore;
 
@@ -86,7 +86,7 @@ pub struct FacetingSettings {
 pub struct PaginationSettings {
     #[cfg_attr(test, proptest(strategy = "test::setting_strategy()"))]
     #[serde(default, skip_serializing_if = "Setting::is_not_set")]
-    pub max_total_hits: Setting<usize>,
+    pub limited_to: Setting<usize>,
 }
 
 /// Holds all the settings for an index. `T` can either be `Checked` if they represents settings
@@ -299,7 +299,7 @@ impl Index {
         primary_key: Option<String>,
         file_store: UpdateFileStore,
         contents: impl IntoIterator<Item = Uuid>,
-    ) -> Result<DocumentAdditionResult> {
+    ) -> Result<Vec<Result<DocumentAdditionResult>>> {
         trace!("performing document addition");
         let mut txn = self.write_txn()?;
 
@@ -323,19 +323,34 @@ impl Index {
             indexing_callback,
         )?;
 
+        let mut results = Vec::new();
         for content_uuid in contents.into_iter() {
             let content_file = file_store.get_update(content_uuid)?;
-            let reader = DocumentBatchReader::from_reader(content_file)?;
-            builder.add_documents(reader)?;
+            let reader = DocumentsBatchReader::from_reader(content_file)?;
+            let (new_builder, user_result) = builder.add_documents(reader)?;
+            builder = new_builder;
+
+            let user_result = match user_result {
+                Ok(count) => {
+                    let addition = DocumentAdditionResult {
+                        indexed_documents: count,
+                        number_of_documents: count,
+                    };
+                    info!("document addition done: {:?}", addition);
+                    Ok(addition)
+                }
+                Err(e) => Err(IndexError::from(e)),
+            };
+
+            results.push(user_result);
         }
 
-        let addition = builder.execute()?;
+        if results.iter().any(Result::is_ok) {
+            let _addition = builder.execute()?;
+            txn.commit()?;
+        }
 
-        txn.commit()?;
-
-        info!("document addition done: {:?}", addition);
-
-        Ok(addition)
+        Ok(results)
     }
 
     pub fn update_settings(&self, settings: &Settings<Checked>) -> Result<()> {
@@ -474,12 +489,12 @@ pub fn apply_settings_to_builder(
     }
 
     match settings.pagination {
-        Setting::Set(ref value) => match value.max_total_hits {
-            Setting::Set(val) => builder.set_pagination_max_total_hits(val),
-            Setting::Reset => builder.reset_pagination_max_total_hits(),
+        Setting::Set(ref value) => match value.limited_to {
+            Setting::Set(val) => builder.set_pagination_limited_to(val),
+            Setting::Reset => builder.reset_pagination_limited_to(),
             Setting::NotSet => (),
         },
-        Setting::Reset => builder.reset_pagination_max_total_hits(),
+        Setting::Reset => builder.reset_pagination_limited_to(),
         Setting::NotSet => (),
     }
 }

meilisearch-lib/src/index_controller/error.rs

@@ -6,11 +6,11 @@ use meilisearch_types::internal_error;
 use tokio::task::JoinError;
 
 use super::DocumentAdditionFormat;
-use crate::document_formats::DocumentFormatError;
 use crate::dump::error::DumpError;
 use crate::index::error::IndexError;
 use crate::tasks::error::TaskError;
 use crate::update_file_store::UpdateFileStoreError;
+use milli::documents::document_formats::DocumentFormatError;
 
 use crate::index_resolver::error::IndexResolverError;
 

meilisearch-lib/src/index_controller/mod.rs

@@ -1,7 +1,7 @@
 use meilisearch_auth::SearchRules;
 use std::collections::BTreeMap;
 use std::fmt;
-use std::io::Cursor;
+use std::io::{BufWriter, Cursor};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
@@ -20,7 +20,6 @@ use tokio::task::spawn_blocking;
 use tokio::time::sleep;
 use uuid::Uuid;
 
-use crate::document_formats::{read_csv, read_json, read_ndjson};
 use crate::dump::{self, load_dump, DumpHandler};
 use crate::index::{
     Checked, Document, IndexMeta, IndexStats, SearchQuery, SearchResult, Settings, Unchecked,
@@ -34,6 +33,7 @@ use crate::tasks::{
     BatchHandler, EmptyBatchHandler, Scheduler, SnapshotHandler, TaskFilter, TaskStore,
 };
 use error::Result;
+use milli::documents::document_formats::{read_csv, read_json, read_ndjson};
 
 use self::error::IndexControllerError;
 use crate::index_resolver::index_store::{IndexStore, MapIndexStore};
@@ -392,6 +392,7 @@ where
                 }
                 let (content_uuid, mut update_file) = self.update_file_store.new_update()?;
                 let documents_count = tokio::task::spawn_blocking(move || -> Result<_> {
+                    let writer = BufWriter::new(&mut *update_file);
                     // check if the payload is empty, and return an error
                     if buffer.is_empty() {
                         return Err(IndexControllerError::MissingPayload(format));
@@ -399,9 +400,9 @@ where
 
                     let reader = Cursor::new(buffer);
                     let count = match format {
-                        DocumentAdditionFormat::Json => read_json(reader, &mut *update_file)?,
-                        DocumentAdditionFormat::Csv => read_csv(reader, &mut *update_file)?,
-                        DocumentAdditionFormat::Ndjson => read_ndjson(reader, &mut *update_file)?,
+                        DocumentAdditionFormat::Json => read_json(reader, writer)?,
+                        DocumentAdditionFormat::Csv => read_csv(reader, writer)?,
+                        DocumentAdditionFormat::Ndjson => read_ndjson(reader, writer)?,
                     };
 
                     update_file.persist()?;

meilisearch-lib/src/index_resolver/meta_store.rs

@@ -3,7 +3,6 @@ use std::fs::{create_dir_all, File};
 use std::io::{BufRead, BufReader, Write};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use walkdir::WalkDir;
 
 use milli::heed::types::{SerdeBincode, Str};
 use milli::heed::{CompactionOption, Database, Env};
@@ -12,6 +11,7 @@ use uuid::Uuid;
 
 use super::error::{IndexResolverError, Result};
 use crate::tasks::task::TaskId;
+use crate::EnvSizer;
 
 #[derive(Serialize, Deserialize)]
 pub struct DumpEntry {
@@ -131,12 +131,7 @@ impl HeedMetaStore {
     }
 
     fn get_size(&self) -> Result<u64> {
-        Ok(WalkDir::new(self.env.path())
-            .into_iter()
-            .filter_map(|entry| entry.ok())
-            .filter_map(|entry| entry.metadata().ok())
-            .filter(|metadata| metadata.is_file())
-            .fold(0, |acc, m| acc + m.len()))
+        Ok(self.env.size())
     }
 
     pub fn dump(&self, path: PathBuf) -> Result<()> {

meilisearch-lib/src/index_resolver/mod.rs

@@ -150,25 +150,34 @@ mod real {
                     })
                     .await;
 
-                    let event = match result {
-                        Ok(Ok(result)) => TaskEvent::Succeeded {
-                            timestamp: OffsetDateTime::now_utc(),
-                            result: TaskResult::DocumentAddition {
-                                indexed_documents: result.indexed_documents,
-                            },
-                        },
-                        Ok(Err(e)) => TaskEvent::Failed {
-                            timestamp: OffsetDateTime::now_utc(),
-                            error: e.into(),
-                        },
-                        Err(e) => TaskEvent::Failed {
-                            timestamp: OffsetDateTime::now_utc(),
-                            error: IndexResolverError::from(e).into(),
-                        },
-                    };
-
-                    for task in tasks.iter_mut() {
-                        task.events.push(event.clone());
+                    match result {
+                        Ok(Ok(results)) => {
+                            for (task, result) in tasks.iter_mut().zip(results) {
+                                let event = match result {
+                                    Ok(addition) => {
+                                        TaskEvent::succeeded(TaskResult::DocumentAddition {
+                                            indexed_documents: addition.indexed_documents,
+                                        })
+                                    }
+                                    Err(error) => {
+                                        TaskEvent::failed(IndexResolverError::from(error))
+                                    }
+                                };
+                                task.events.push(event);
+                            }
+                        }
+                        Ok(Err(e)) => {
+                            let event = TaskEvent::failed(e);
+                            for task in tasks.iter_mut() {
+                                task.events.push(event.clone());
+                            }
+                        }
+                        Err(e) => {
+                            let event = TaskEvent::failed(IndexResolverError::from(e));
+                            for task in tasks.iter_mut() {
+                                task.events.push(event.clone());
+                            }
+                        }
                     }
                 }
                 _ => panic!("invalid batch!"),

meilisearch-lib/src/lib.rs

@@ -18,7 +18,23 @@ pub use milli;
 pub use milli::heed;
 
 mod compression;
-pub mod document_formats;
+
+use walkdir::WalkDir;
+
+pub trait EnvSizer {
+    fn size(&self) -> u64;
+}
+
+impl EnvSizer for milli::heed::Env {
+    fn size(&self) -> u64 {
+        WalkDir::new(self.path())
+            .into_iter()
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| entry.metadata().ok())
+            .filter(|metadata| metadata.is_file())
+            .fold(0, |acc, m| acc + m.len())
+    }
+}
 
 /// Check if a db is empty. It does not provide any information on the
 /// validity of the data in it.

meilisearch-lib/src/snapshot.rs

@@ -7,7 +7,6 @@ use anyhow::bail;
 use fs_extra::dir::{self, CopyOptions};
 use log::{info, trace};
 use meilisearch_auth::open_auth_store_env;
-use milli::heed::CompactionOption;
 use tokio::sync::RwLock;
 use tokio::time::sleep;
 use walkdir::WalkDir;
@@ -182,7 +181,7 @@ impl SnapshotJob {
             let mut options = milli::heed::EnvOpenOptions::new();
             options.map_size(self.index_size);
             let index = milli::Index::new(options, entry.path())?;
-            index.copy_to_path(dst, CompactionOption::Enabled)?;
+            index.copy_to_path(dst, milli::heed::CompactionOption::Enabled)?;
         }
 
         Ok(())

meilisearch-lib/src/update_file_store.rs

@@ -3,8 +3,7 @@ use std::io::{self, BufReader, BufWriter, Write};
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 
-use milli::documents::DocumentBatchReader;
-use serde_json::Map;
+use milli::documents::DocumentsBatchReader;
 use tempfile::{NamedTempFile, PersistError};
 use uuid::Uuid;
 
@@ -15,7 +14,7 @@ pub use test::MockUpdateFileStore as UpdateFileStore;
 
 const UPDATE_FILES_PATH: &str = "updates/updates_files";
 
-use crate::document_formats::read_ndjson;
+use milli::documents::document_formats::read_ndjson;
 
 pub struct UpdateFile {
     path: PathBuf,
@@ -44,7 +43,8 @@ into_update_store_error!(
     PersistError,
     io::Error,
     serde_json::Error,
-    milli::documents::Error
+    milli::documents::Error,
+    milli::documents::DocumentsBatchCursorError
 );
 
 impl UpdateFile {
@@ -149,23 +149,14 @@ mod store {
 
             let update_file = File::open(update_file_path)?;
             let mut dst_file = NamedTempFile::new_in(&dump_path)?;
-            let mut document_reader = DocumentBatchReader::from_reader(update_file)?;
+            let mut document_cursor = DocumentsBatchReader::from_reader(update_file)?.into_cursor();
 
-            let mut document_buffer = Map::new();
-            // TODO: we need to find a way to do this more efficiently. (create a custom serializer
-            // for jsonl for example...)
-            while let Some((index, document)) = document_reader.next_document_with_index()? {
-                for (field_id, content) in document.iter() {
-                    if let Some(field_name) = index.name(field_id) {
-                        let content = serde_json::from_slice(content)?;
-                        document_buffer.insert(field_name.to_string(), content);
-                    }
-                }
-
-                serde_json::to_writer(&mut dst_file, &document_buffer)?;
-                dst_file.write_all(b"\n")?;
-                document_buffer.clear();
+            let mut dst_file_buf_writer = BufWriter::new(&mut dst_file);
+            while let Some(document) = document_cursor.next_document()? {
+                serde_json::to_writer(&mut dst_file_buf_writer, &document)?;
+                dst_file_buf_writer.write_all(b"\n")?;
             }
+            drop(dst_file_buf_writer);
 
             dst_file.persist(dst)?;
 

meilisearch-types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meilisearch-types"
-version = "0.28.1"
+version = "0.28.0"
 authors = ["marin <postma.marin@protonmail.com>"]
 edition = "2021"
 
@@ -10,6 +10,7 @@ proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
+milli = { path = "../../milli/milli" }
 
 [features]
 test-traits = ["proptest", "proptest-derive"]

meilisearch-types/src/error.rs

@@ -94,6 +94,17 @@ pub trait ErrorCode: std::error::Error {
     }
 }
 
+impl ErrorCode for milli::documents::document_formats::DocumentFormatError {
+    fn error_code(&self) -> Code {
+        match self {
+            milli::documents::document_formats::DocumentFormatError::Internal(_) => Code::Internal,
+            milli::documents::document_formats::DocumentFormatError::MalformedPayload(_, _) => {
+                Code::MalformedPayload
+            }
+        }
+    }
+}
+
 #[allow(clippy::enum_variant_names)]
 enum ErrorType {
     InternalError,

permissive-json-pointer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "permissive-json-pointer"
-version = "0.28.1"
+version = "0.2.0"
 edition = "2021"
 description = "A permissive json pointer"
 readme = "README.md"

permissive-json-pointer/src/lib.rs

@@ -49,7 +49,7 @@ fn contained_in(selector: &str, key: &str) -> bool {
 /// map_leaf_values(
 ///     value.as_object_mut().unwrap(),
 ///     ["jean.race.name"],
-///     |key, value| match (value, dbg!(key)) {
+///     |key, value| match (value, key) {
 ///         (Value::String(name), "jean.race.name") => *name = "patou".to_string(),
 ///         _ => unreachable!(),
 ///     },
@@ -729,7 +729,7 @@ mod tests {
         map_leaf_values(
             value.as_object_mut().unwrap(),
             ["jean.race.name"],
-            |key, value| match (value, dbg!(key)) {
+            |key, value| match (value, key) {
                 (Value::String(name), "jean.race.name") => *name = S("patou"),
                 _ => unreachable!(),
             },