TMP: check windows free disk space

2025-12-04 03:35:43 +00:00 · 2024-05-29 11:27:27 +02:00
29 changed files with 329 additions and 789 deletions
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -56,6 +56,12 @@ jobs:
      matrix:
        os: [macos-12, windows-2022]
    steps:
+      - name: Check free disk space on C
+        run: |
+          fsutil volume diskfree c:
+      - name: Check free disk space on D
+        run: |
+          fsutil volume diskfree d:
      - uses: actions/checkout@v3
      - name: Cache dependencies
        uses: Swatinem/rust-cache@v2.7.1
@@ -63,11 +69,23 @@ jobs:
        with:
          toolchain: stable
          override: true
+      - name: Check free disk space on C
+        run: |
+          fsutil volume diskfree c:
+      - name: Check free disk space on D
+        run: |
+          fsutil volume diskfree d:
      - name: Run cargo check without any default features
        uses: actions-rs/cargo@v1
        with:
          command: build
          args: --locked --release --no-default-features --all
+      - name: Check free disk space on C
+        run: |
+          fsutil volume diskfree c:
+      - name: Check free disk space on D
+        run: |
+          fsutil volume diskfree d:
      - name: Run cargo test
        uses: actions-rs/cargo@v1
        with:
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -500,7 +500,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"

 [[package]]
 name = "benchmarks"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "anyhow",
 "bytes",
@@ -645,7 +645,7 @@ dependencies = [

 [[package]]
 name = "build-info"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "anyhow",
 "time",
@@ -1545,7 +1545,7 @@ dependencies = [

 [[package]]
 name = "dump"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "anyhow",
 "big_s",
@@ -1793,7 +1793,7 @@ dependencies = [

 [[package]]
 name = "file-store"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "faux",
 "tempfile",
@@ -1816,7 +1816,7 @@ dependencies = [

 [[package]]
 name = "filter-parser"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "insta",
 "nom",
@@ -1836,7 +1836,7 @@ dependencies = [

 [[package]]
 name = "flatten-serde-json"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "criterion",
 "serde_json",
@@ -1954,7 +1954,7 @@ dependencies = [

 [[package]]
 name = "fuzzers"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "arbitrary",
 "clap",
@@ -2447,7 +2447,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"

 [[package]]
 name = "index-scheduler"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "anyhow",
 "big_s",
@@ -2642,7 +2642,7 @@ dependencies = [

 [[package]]
 name = "json-depth-checker"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "criterion",
 "serde_json",
@@ -3272,7 +3272,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"

 [[package]]
 name = "meili-snap"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "insta",
 "md5",
@@ -3281,7 +3281,7 @@ dependencies = [

 [[package]]
 name = "meilisearch"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "actix-cors",
 "actix-http",
@@ -3373,7 +3373,7 @@ dependencies = [

 [[package]]
 name = "meilisearch-auth"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "base64 0.21.7",
 "enum-iterator",
@@ -3392,7 +3392,7 @@ dependencies = [

 [[package]]
 name = "meilisearch-types"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "actix-web",
 "anyhow",
@@ -3422,7 +3422,7 @@ dependencies = [

 [[package]]
 name = "meilitool"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -3461,7 +3461,7 @@ dependencies = [

 [[package]]
 name = "milli"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "arroy",
 "big_s",
@@ -3901,7 +3901,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

 [[package]]
 name = "permissive-json-pointer"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "big_s",
 "serde_json",
@@ -5063,18 +5063,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6052,7 +6052,7 @@ dependencies = [

 [[package]]
 name = "xtask"
-version = "1.9.0"
+version = "1.8.0"
 dependencies = [
 "anyhow",
 "build-info",
@@ -6090,13 +6090,12 @@ dependencies = [

 [[package]]
 name = "yaup"
-version = "0.3.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6"
+checksum = "a59e7d27bed43f7c37c25df5192ea9d435a8092a902e02203359ac9ce3e429d9"
 dependencies = [
- "form_urlencoded",
 "serde",
- "thiserror",
+ "url",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ members = [
 ]

 [workspace.package]
-version = "1.9.0"
+version = "1.8.0"
 authors = [
    "Quentin de Quelen <quentin@dequelen.me>",
    "Clément Renault <clement@meilisearch.com>",
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@

 <p align="center">⚡ A lightning-fast search engine that fits effortlessly into your apps, websites, and workflow 🔍</p>

-[Meilisearch](https://www.meilisearch.com) helps you shape a delightful search experience in a snap, offering features that work out of the box to speed up your workflow.
+Meilisearch helps you shape a delightful search experience in a snap, offering features that work out-of-the-box to speed up your workflow.

 <p align="center" name="demo">
  <a href="https://where2watch.meilisearch.com/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=demo-gif#gh-light-mode-only" target="_blank">
@@ -39,8 +39,8 @@
 🔥 [**Try it!**](https://where2watch.meilisearch.com/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=demo-link) 🔥

 ## ✨ Features
- **Hybrid search:** Combine the best of both [semantic](https://www.meilisearch.com/docs/learn/experimental/vector_search) & full-text search to get the most relevant results
- **Search-as-you-type:** find & display results in less than 50 milliseconds to provide an intuitive experience
+
+- **Search-as-you-type:** find search results in less than 50 milliseconds
 - **[Typo tolerance](https://www.meilisearch.com/docs/learn/configuration/typo_tolerance?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** get relevant matches even when queries contain typos and misspellings
 - **[Filtering](https://www.meilisearch.com/docs/learn/fine_tuning_results/filtering?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features) and [faceted search](https://www.meilisearch.com/docs/learn/fine_tuning_results/faceted_search?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** enhance your users' search experience with custom filters and build a faceted search interface in a few lines of code
 - **[Sorting](https://www.meilisearch.com/docs/learn/fine_tuning_results/sorting?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** sort results based on price, date, or pretty much anything else your users need
@@ -55,15 +55,15 @@

 ## 📖 Documentation

-You can consult Meilisearch's documentation at [meilisearch.com/docs](https://www.meilisearch.com/docs/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=docs).
+You can consult Meilisearch's documentation at [https://www.meilisearch.com/docs](https://www.meilisearch.com/docs/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=docs).

 ## 🚀 Getting started

 For basic instructions on how to set up Meilisearch, add documents to an index, and search for documents, take a look at our [Quick Start](https://www.meilisearch.com/docs/learn/getting_started/quick_start?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=get-started) guide.

-## 🌍 Supercharge your Meilisearch experience
+## ⚡ Supercharge your Meilisearch experience

-Say goodbye to server deployment and manual updates with [Meilisearch Cloud](https://www.meilisearch.com/cloud?utm_campaign=oss&utm_source=github&utm_medium=meilisearch). Additional features include analytics & monitoring in many regions around the world. No credit card is required.
+Say goodbye to server deployment and manual updates with [Meilisearch Cloud](https://www.meilisearch.com/cloud?utm_campaign=oss&utm_source=github&utm_medium=meilisearch). No credit card required.

 ## 🧰 SDKs & integration tools

@@ -85,13 +85,13 @@ Finally, for more in-depth information, refer to our articles explaining fundame

 Meilisearch collects **anonymized** data from users to help us improve our product. You can [deactivate this](https://www.meilisearch.com/docs/learn/what_is_meilisearch/telemetry?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=telemetry#how-to-disable-data-collection) whenever you want.

-To request deletion of collected data, please write to us at [privacy@meilisearch.com](mailto:privacy@meilisearch.com). Remember to include your `Instance UID` in the message, as this helps us quickly find and delete your data.
+To request deletion of collected data, please write to us at [privacy@meilisearch.com](mailto:privacy@meilisearch.com). Don't forget to include your `Instance UID` in the message, as this helps us quickly find and delete your data.

 If you want to know more about the kind of data we collect and what we use it for, check the [telemetry section](https://www.meilisearch.com/docs/learn/what_is_meilisearch/telemetry?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=telemetry#how-to-disable-data-collection) of our documentation.

 ## 📫 Get in touch!

-Meilisearch is a search engine created by [Meili]([https://www.welcometothejungle.com/en/companies/meilisearch](https://www.meilisearch.com/careers)), a software development company headquartered in France and with team members all over the world. Want to know more about us? [Check out our blog!](https://blog.meilisearch.com/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=contact)
+Meilisearch is a search engine created by [Meili](https://www.welcometothejungle.com/en/companies/meilisearch), a software development company based in France and with team members all over the world. Want to know more about us? [Check out our blog!](https://blog.meilisearch.com/?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=contact)

 🗞 [Subscribe to our newsletter](https://meilisearch.us2.list-manage.com/subscribe?u=27870f7b71c908a8b359599fb&id=79582d828e) if you don't want to miss any updates! We promise we won't clutter your mailbox: we only send one edition every two months.

--- a/meilisearch/Cargo.toml
+++ b/meilisearch/Cargo.toml
@@ -98,6 +98,7 @@ tokio-stream = "0.1.14"
 toml = "0.8.8"
 uuid = { version = "1.6.1", features = ["serde", "v4"] }
 walkdir = "2.4.0"
+yaup = "0.2.1"
 serde_urlencoded = "0.7.1"
 termcolor = "1.4.1"
 url = { version = "2.5.0", features = ["serde"] }
@@ -117,7 +118,7 @@ maplit = "1.0.2"
 meili-snap = { path = "../meili-snap" }
 temp-env = "0.3.6"
 urlencoding = "2.1.3"
-yaup = "0.3.1"
+yaup = "0.2.1"

 [build-dependencies]
 anyhow = { version = "1.0.79", optional = true }
--- a/meilisearch/src/search.rs
+++ b/meilisearch/src/search.rs
@@ -477,8 +477,6 @@ pub enum MatchingStrategy {
    Last,
    /// All query words are mandatory
    All,
-    /// Remove query words from the most frequent to the least
-    Frequency,
 }

 impl Default for MatchingStrategy {
@@ -492,7 +490,6 @@ impl From<MatchingStrategy> for TermsMatchingStrategy {
        match other {
            MatchingStrategy::Last => Self::Last,
            MatchingStrategy::All => Self::All,
-            MatchingStrategy::Frequency => Self::Frequency,
        }
    }
 }
--- a/meilisearch/tests/common/index.rs
+++ b/meilisearch/tests/common/index.rs
@@ -376,7 +376,7 @@ impl Index<'_> {
    }

    pub async fn search_get(&self, query: &str) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/search{}", urlencode(self.uid.as_ref()), query);
+        let url = format!("/indexes/{}/search?{}", urlencode(self.uid.as_ref()), query);
        self.service.get(url).await
    }

@@ -413,7 +413,7 @@ impl Index<'_> {
    }

    pub async fn similar_get(&self, query: &str) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/similar{}", urlencode(self.uid.as_ref()), query);
+        let url = format!("/indexes/{}/similar?{}", urlencode(self.uid.as_ref()), query);
        self.service.get(url).await
    }

--- a/meilisearch/tests/search/errors.rs
+++ b/meilisearch/tests/search/errors.rs
@@ -71,7 +71,7 @@ async fn search_bad_offset() {
    }
    "###);

-    let (response, code) = index.search_get("?offset=doggo").await;
+    let (response, code) = index.search_get("offset=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -99,7 +99,7 @@ async fn search_bad_limit() {
    }
    "###);

-    let (response, code) = index.search_get("?limit=doggo").await;
+    let (response, code) = index.search_get("limit=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -127,7 +127,7 @@ async fn search_bad_page() {
    }
    "###);

-    let (response, code) = index.search_get("?page=doggo").await;
+    let (response, code) = index.search_get("page=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -155,7 +155,7 @@ async fn search_bad_hits_per_page() {
    }
    "###);

-    let (response, code) = index.search_get("?hitsPerPage=doggo").await;
+    let (response, code) = index.search_get("hitsPerPage=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -201,7 +201,7 @@ async fn search_bad_crop_length() {
    }
    "###);

-    let (response, code) = index.search_get("?cropLength=doggo").await;
+    let (response, code) = index.search_get("cropLength=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -291,7 +291,7 @@ async fn search_bad_show_matches_position() {
    }
    "###);

-    let (response, code) = index.search_get("?showMatchesPosition=doggo").await;
+    let (response, code) = index.search_get("showMatchesPosition=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -340,7 +340,7 @@ async fn search_non_filterable_facets() {
    }
    "###);

-    let (response, code) = index.search_get("?facets=doggo").await;
+    let (response, code) = index.search_get("facets=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -370,7 +370,7 @@ async fn search_non_filterable_facets_multiple_filterable() {
    }
    "###);

-    let (response, code) = index.search_get("?facets=doggo").await;
+    let (response, code) = index.search_get("facets=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -400,7 +400,7 @@ async fn search_non_filterable_facets_no_filterable() {
    }
    "###);

-    let (response, code) = index.search_get("?facets=doggo").await;
+    let (response, code) = index.search_get("facets=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -430,7 +430,7 @@ async fn search_non_filterable_facets_multiple_facets() {
    }
    "###);

-    let (response, code) = index.search_get("?facets=doggo,neko").await;
+    let (response, code) = index.search_get("facets=doggo,neko").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -505,7 +505,7 @@ async fn search_bad_matching_strategy() {
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Unknown value `doggo` at `.matchingStrategy`: expected one of `last`, `all`, `frequency`",
+      "message": "Unknown value `doggo` at `.matchingStrategy`: expected one of `last`, `all`",
      "code": "invalid_search_matching_strategy",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#invalid_search_matching_strategy"
@@ -523,11 +523,11 @@ async fn search_bad_matching_strategy() {
    }
    "###);

-    let (response, code) = index.search_get("?matchingStrategy=doggo").await;
+    let (response, code) = index.search_get("matchingStrategy=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Unknown value `doggo` for parameter `matchingStrategy`: expected one of `last`, `all`, `frequency`",
+      "message": "Unknown value `doggo` for parameter `matchingStrategy`: expected one of `last`, `all`",
      "code": "invalid_search_matching_strategy",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#invalid_search_matching_strategy"
--- a/meilisearch/tests/search/geo.rs
+++ b/meilisearch/tests/search/geo.rs
@@ -117,69 +117,3 @@ async fn geo_bounding_box_with_string_and_number() {
        )
        .await;
 }
-
-#[actix_rt::test]
-async fn bug_4640() {
-    // https://github.com/meilisearch/meilisearch/issues/4640
-    let server = Server::new().await;
-    let index = server.index("test");
-
-    let documents = DOCUMENTS.clone();
-    index.add_documents(documents, None).await;
-    index.update_settings_filterable_attributes(json!(["_geo"])).await;
-    let (ret, _code) = index.update_settings_sortable_attributes(json!(["_geo"])).await;
-    index.wait_task(ret.uid()).await;
-
-    // Sort the document with the second one first
-    index
-        .search(
-            json!({
-                "sort": ["_geoPoint(45.4777599, 9.1967508):asc"],
-            }),
-            |response, code| {
-                assert_eq!(code, 200, "{}", response);
-                snapshot!(json_string!(response, { ".processingTimeMs" => "[time]" }), @r###"
-                {
-                  "hits": [
-                    {
-                      "id": 2,
-                      "name": "La Bella Italia",
-                      "address": "456 Elm Street, Townsville",
-                      "type": "Italian",
-                      "rating": 9,
-                      "_geo": {
-                        "lat": "45.4777599",
-                        "lng": "9.1967508"
-                      }
-                    },
-                    {
-                      "id": 1,
-                      "name": "Taco Truck",
-                      "address": "444 Salsa Street, Burritoville",
-                      "type": "Mexican",
-                      "rating": 9,
-                      "_geo": {
-                        "lat": 34.0522,
-                        "lng": -118.2437
-                      },
-                      "_geoDistance": 9714063
-                    },
-                    {
-                      "id": 3,
-                      "name": "Crêpe Truck",
-                      "address": "2 Billig Avenue, Rouenville",
-                      "type": "French",
-                      "rating": 10
-                    }
-                  ],
-                  "query": "",
-                  "processingTimeMs": "[time]",
-                  "limit": 20,
-                  "offset": 0,
-                  "estimatedTotalHits": 3
-                }
-                "###);
-            },
-        )
-        .await;
-}
--- a/meilisearch/tests/search/matching_strategy.rs
+++ b/meilisearch/tests/search/matching_strategy.rs
@@ -1,128 +0,0 @@
-use meili_snap::snapshot;
-use once_cell::sync::Lazy;
-
-use crate::common::index::Index;
-use crate::common::{Server, Value};
-use crate::json;
-
-async fn index_with_documents<'a>(server: &'a Server, documents: &Value) -> Index<'a> {
-    let index = server.index("test");
-
-    index.add_documents(documents.clone(), None).await;
-    index.wait_task(0).await;
-    index
-}
-
-static SIMPLE_SEARCH_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
-    json!([
-    {
-        "title": "Shazam!",
-        "id": "1",
-    },
-    {
-        "title": "Captain Planet",
-        "id": "2",
-    },
-    {
-        "title": "Captain Marvel",
-        "id": "3",
-    },
-    {
-        "title": "a Captain Marvel ersatz",
-        "id": "4"
-    },
-    {
-        "title": "He's not part of the Marvel Cinematic Universe",
-        "id": "5"
-    },
-    {
-        "title": "a Shazam ersatz, but better than Captain Planet",
-        "id": "6"
-    },
-    {
-        "title": "Capitain CAAAAAVEEERNE!!!!",
-        "id": "7"
-    }
-    ])
-});
-
-#[actix_rt::test]
-async fn simple_search() {
-    let server = Server::new().await;
-    let index = index_with_documents(&server, &SIMPLE_SEARCH_DOCUMENTS).await;
-
-    index
-        .search(json!({"q": "Captain Marvel", "matchingStrategy": "last", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"},{"id":"2"},{"id":"6"},{"id":"7"}]"###);
-        })
-        .await;
-
-    index
-        .search(json!({"q": "Captain Marvel", "matchingStrategy": "all", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"}]"###);
-        })
-        .await;
-
-    index
-        .search(json!({"q": "Captain Marvel", "matchingStrategy": "frequency", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"},{"id":"5"}]"###);
-        })
-        .await;
-}
-
-#[actix_rt::test]
-async fn search_with_typo() {
-    let server = Server::new().await;
-    let index = index_with_documents(&server, &SIMPLE_SEARCH_DOCUMENTS).await;
-
-    index
-        .search(json!({"q": "Capitain Marvel", "matchingStrategy": "last", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"},{"id":"7"},{"id":"2"},{"id":"6"}]"###);
-        })
-        .await;
-
-    index
-        .search(json!({"q": "Capitain Marvel", "matchingStrategy": "all", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"}]"###);
-        })
-        .await;
-
-    index
-        .search(json!({"q": "Capitain Marvel", "matchingStrategy": "frequency", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"},{"id":"5"}]"###);
-        })
-        .await;
-}
-
-#[actix_rt::test]
-async fn search_with_unknown_word() {
-    let server = Server::new().await;
-    let index = index_with_documents(&server, &SIMPLE_SEARCH_DOCUMENTS).await;
-
-    index
-        .search(json!({"q": "Captain Supercopter Marvel", "matchingStrategy": "last", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"2"},{"id":"3"},{"id":"4"},{"id":"6"},{"id":"7"}]"###);
-        })
-        .await;
-
-    index
-        .search(json!({"q": "Captain Supercopter Marvel", "matchingStrategy": "all", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @"[]");
-        })
-        .await;
-
-    index
-        .search(json!({"q": "Captain Supercopter Marvel", "matchingStrategy": "frequency", "attributesToRetrieve": ["id"]}), |response, code| {
-            snapshot!(code, @"200 OK");
-            snapshot!(response["hits"], @r###"[{"id":"3"},{"id":"4"},{"id":"5"}]"###);
-        })
-        .await;
-}
--- a/meilisearch/tests/search/mod.rs
+++ b/meilisearch/tests/search/mod.rs
@@ -7,7 +7,6 @@ mod facet_search;
 mod formatted;
 mod geo;
 mod hybrid;
-mod matching_strategy;
 mod multi;
 mod pagination;
 mod restrict_searchable;
--- a/meilisearch/tests/similar/errors.rs
+++ b/meilisearch/tests/similar/errors.rs
@@ -179,7 +179,7 @@ async fn similar_bad_offset() {
    }
    "###);

-    let (response, code) = index.similar_get("?id=287947&offset=doggo").await;
+    let (response, code) = index.similar_get("id=287947&offset=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -221,7 +221,7 @@ async fn similar_bad_limit() {
    }
    "###);

-    let (response, code) = index.similar_get("?id=287946&limit=doggo").await;
+    let (response, code) = index.similar_get("id=287946&limit=doggo").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
--- a/meilisearch/tests/snapshot/mod.rs
+++ b/meilisearch/tests/snapshot/mod.rs
@@ -31,7 +31,6 @@ macro_rules! verify_snapshot {
 }

 #[actix_rt::test]
-#[cfg_attr(target_os = "windows", ignore)]
 async fn perform_snapshot() {
    let temp = tempfile::tempdir().unwrap();
    let snapshot_dir = tempfile::tempdir().unwrap();
--- a/milli/src/search/mod.rs
+++ b/milli/src/search/mod.rs
@@ -277,8 +277,6 @@ pub enum TermsMatchingStrategy {
    Last,
    // all words are mandatory
    All,
-    // remove more frequent word first
-    Frequency,
 }

 impl Default for TermsMatchingStrategy {
--- a/milli/src/search/new/graph_based_ranking_rule.rs
+++ b/milli/src/search/new/graph_based_ranking_rule.rs
@@ -164,21 +164,6 @@ impl<'ctx, G: RankingRuleGraphTrait> RankingRule<'ctx, QueryGraph> for GraphBase
                    }
                    costs
                }
-                TermsMatchingStrategy::Frequency => {
-                    let removal_order =
-                        query_graph.removal_order_for_terms_matching_strategy_frequency(ctx)?;
-                    let mut forbidden_nodes =
-                        SmallBitmap::for_interned_values_in(&query_graph.nodes);
-                    let mut costs = query_graph.nodes.map(|_| None);
-                    // FIXME: this works because only words uses termsmatchingstrategy at the moment.
-                    for ns in removal_order {
-                        for n in ns.iter() {
-                            *costs.get_mut(n) = Some((1, forbidden_nodes.clone()));
-                        }
-                        forbidden_nodes.union(&ns);
-                    }
-                    costs
-                }
                TermsMatchingStrategy::All => query_graph.nodes.map(|_| None),
            }
        } else {
--- a/milli/src/search/new/mod.rs
+++ b/milli/src/search/new/mod.rs
@@ -197,11 +197,6 @@ fn resolve_maximally_reduced_query_graph(
            .iter()
            .flat_map(|x| x.iter())
            .collect(),
-        TermsMatchingStrategy::Frequency => query_graph
-            .removal_order_for_terms_matching_strategy_frequency(ctx)?
-            .iter()
-            .flat_map(|x| x.iter())
-            .collect(),
        TermsMatchingStrategy::All => vec![],
    };
    graph.remove_nodes_keep_edges(&nodes_to_remove);
--- a/milli/src/search/new/query_graph.rs
+++ b/milli/src/search/new/query_graph.rs
@@ -1,9 +1,8 @@
-use std::cmp::{Ordering, Reverse};
+use std::cmp::Ordering;
 use std::collections::BTreeMap;
 use std::hash::{Hash, Hasher};

 use fxhash::{FxHashMap, FxHasher};
-use roaring::RoaringBitmap;

 use super::interner::{FixedSizeInterner, Interned};
 use super::query_term::{
@@ -12,7 +11,6 @@ use super::query_term::{
 use super::small_bitmap::SmallBitmap;
 use super::SearchContext;
 use crate::search::new::interner::Interner;
-use crate::search::new::resolve_query_graph::compute_query_term_subset_docids;
 use crate::Result;

 /// A node of the [`QueryGraph`].
@@ -292,49 +290,6 @@ impl QueryGraph {
        }
    }

-    pub fn removal_order_for_terms_matching_strategy_frequency(
-        &self,
-        ctx: &mut SearchContext,
-    ) -> Result<Vec<SmallBitmap<QueryNode>>> {
-        // lookup frequency for each term
-        let mut term_with_frequency: Vec<(u8, u64)> = {
-            let mut term_docids: BTreeMap<u8, RoaringBitmap> = Default::default();
-            for (_, node) in self.nodes.iter() {
-                match &node.data {
-                    QueryNodeData::Term(t) => {
-                        let docids = compute_query_term_subset_docids(ctx, &t.term_subset)?;
-                        for id in t.term_ids.clone() {
-                            term_docids
-                                .entry(id)
-                                .and_modify(|curr| *curr |= &docids)
-                                .or_insert_with(|| docids.clone());
-                        }
-                    }
-                    QueryNodeData::Deleted | QueryNodeData::Start | QueryNodeData::End => continue,
-                }
-            }
-            term_docids
-                .into_iter()
-                .map(|(idx, docids)| match docids.len() {
-                    0 => (idx, u64::max_value()),
-                    frequency => (idx, frequency),
-                })
-                .collect()
-        };
-        term_with_frequency.sort_by_key(|(_, frequency)| Reverse(*frequency));
-        let mut term_weight = BTreeMap::new();
-        let mut weight: u16 = 1;
-        let mut peekable = term_with_frequency.into_iter().peekable();
-        while let Some((idx, frequency)) = peekable.next() {
-            term_weight.insert(idx, weight);
-            if peekable.peek().map_or(false, |(_, f)| frequency != *f) {
-                weight += 1;
-            }
-        }
-        let cost_of_term_idx = move |term_idx: u8| *term_weight.get(&term_idx).unwrap();
-        Ok(self.removal_order_for_terms_matching_strategy(ctx, cost_of_term_idx))
-    }
-
    pub fn removal_order_for_terms_matching_strategy_last(
        &self,
        ctx: &SearchContext,
@@ -360,19 +315,10 @@ impl QueryGraph {
        if first_term_idx >= last_term_idx {
            return vec![];
        }
-
        let cost_of_term_idx = |term_idx: u8| {
            let rank = 1 + last_term_idx - term_idx;
            rank as u16
        };
-        self.removal_order_for_terms_matching_strategy(ctx, cost_of_term_idx)
-    }
-
-    pub fn removal_order_for_terms_matching_strategy(
-        &self,
-        ctx: &SearchContext,
-        order: impl Fn(u8) -> u16,
-    ) -> Vec<SmallBitmap<QueryNode>> {
        let mut nodes_to_remove = BTreeMap::<u16, SmallBitmap<QueryNode>>::new();
        let mut at_least_one_mandatory_term = false;
        for (node_id, node) in self.nodes.iter() {
@@ -383,7 +329,7 @@ impl QueryGraph {
            }
            let mut cost = 0;
            for id in t.term_ids.clone() {
-                cost = std::cmp::max(cost, order(id));
+                cost = std::cmp::max(cost, cost_of_term_idx(id));
            }
            nodes_to_remove
                .entry(cost)
--- a/milli/src/update/del_add.rs
+++ b/milli/src/update/del_add.rs
@@ -40,26 +40,11 @@ pub fn into_del_add_obkv<K: obkv::Key + PartialOrd>(
    operation: DelAddOperation,
    buffer: &mut Vec<u8>,
 ) -> Result<(), std::io::Error> {
-    into_del_add_obkv_conditional_operation(reader, buffer, |_| operation)
-}
-
-/// Akin to the [into_del_add_obkv] function but lets you
-/// conditionally define the `DelAdd` variant based on the obkv key.
-pub fn into_del_add_obkv_conditional_operation<K, F>(
-    reader: obkv::KvReader<K>,
-    buffer: &mut Vec<u8>,
-    operation: F,
-) -> std::io::Result<()>
-where
-    K: obkv::Key + PartialOrd,
-    F: Fn(K) -> DelAddOperation,
-{
    let mut writer = obkv::KvWriter::new(buffer);
    let mut value_buffer = Vec::new();
    for (key, value) in reader.iter() {
        value_buffer.clear();
        let mut value_writer = KvWriterDelAdd::new(&mut value_buffer);
-        let operation = operation(key);
        if matches!(operation, DelAddOperation::Deletion | DelAddOperation::DeletionAndAddition) {
            value_writer.insert(DelAdd::Deletion, value)?;
        }
--- a/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs
+++ b/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs
@@ -1,5 +1,5 @@
 use std::borrow::Cow;
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeMap;
 use std::convert::TryInto;
 use std::fs::File;
 use std::io::{self, BufReader};
@@ -9,7 +9,7 @@ use std::result::Result as StdResult;
 use bytemuck::bytes_of;
 use grenad::Sorter;
 use heed::BytesEncode;
-use itertools::{merge_join_by, EitherOrBoth};
+use itertools::EitherOrBoth;
 use ordered_float::OrderedFloat;
 use roaring::RoaringBitmap;
 use serde_json::{from_slice, Value};
@@ -18,7 +18,7 @@ use FilterableValues::{Empty, Null, Values};
 use super::helpers::{create_sorter, keep_first, sorter_into_reader, GrenadParameters};
 use crate::error::InternalError;
 use crate::facet::value_encoding::f64_into_bytes;
-use crate::update::del_add::{DelAdd, KvReaderDelAdd, KvWriterDelAdd};
+use crate::update::del_add::{DelAdd, KvWriterDelAdd};
 use crate::update::index_documents::{create_writer, writer_into_reader};
 use crate::update::settings::InnerIndexSettingsDiff;
 use crate::{CboRoaringBitmapCodec, DocumentId, Error, FieldId, Result, MAX_FACET_VALUE_LENGTH};
@@ -45,6 +45,7 @@ pub fn extract_fid_docid_facet_values<R: io::Read + io::Seek>(
    obkv_documents: grenad::Reader<R>,
    indexer: GrenadParameters,
    settings_diff: &InnerIndexSettingsDiff,
+    geo_fields_ids: Option<(FieldId, FieldId)>,
 ) -> Result<ExtractedFacetValues> {
    let max_memory = indexer.max_memory_by_thread();

@@ -75,181 +76,143 @@ pub fn extract_fid_docid_facet_values<R: io::Read + io::Seek>(
    let mut numbers_key_buffer = Vec::new();
    let mut strings_key_buffer = Vec::new();

-    let old_faceted_fids: BTreeSet<_> =
-        settings_diff.old.faceted_fields_ids.iter().copied().collect();
-    let new_faceted_fids: BTreeSet<_> =
-        settings_diff.new.faceted_fields_ids.iter().copied().collect();
+    let mut cursor = obkv_documents.into_cursor()?;
+    while let Some((docid_bytes, value)) = cursor.move_on_next()? {
+        let obkv = obkv::KvReader::new(value);

-    if !settings_diff.settings_update_only || old_faceted_fids != new_faceted_fids {
-        let mut cursor = obkv_documents.into_cursor()?;
-        while let Some((docid_bytes, value)) = cursor.move_on_next()? {
-            let obkv = obkv::KvReader::new(value);
-            let get_document_json_value = move |field_id, side| {
-                obkv.get(field_id)
-                    .map(KvReaderDelAdd::new)
-                    .and_then(|kv| kv.get(side))
-                    .map(from_slice)
-                    .transpose()
-                    .map_err(InternalError::SerdeJson)
-            };
-            // iterate over the faceted fields instead of over the whole document.
-            for eob in
-                merge_join_by(old_faceted_fids.iter(), new_faceted_fids.iter(), |old, new| {
-                    old.cmp(new)
-                })
-            {
-                let (field_id, del_value, add_value) = match eob {
-                    EitherOrBoth::Left(&field_id) => {
-                        let del_value = get_document_json_value(field_id, DelAdd::Deletion)?;
+        for (field_id, field_bytes) in obkv.iter() {
+            let delete_faceted = settings_diff.old.faceted_fields_ids.contains(&field_id);
+            let add_faceted = settings_diff.new.faceted_fields_ids.contains(&field_id);
+            if delete_faceted || add_faceted {
+                numbers_key_buffer.clear();
+                strings_key_buffer.clear();

-                        // deletion only
-                        (field_id, del_value, None)
-                    }
-                    EitherOrBoth::Right(&field_id) => {
-                        let add_value = get_document_json_value(field_id, DelAdd::Addition)?;
+                // Set key to the field_id
+                // Note: this encoding is consistent with FieldIdCodec
+                numbers_key_buffer.extend_from_slice(&field_id.to_be_bytes());
+                strings_key_buffer.extend_from_slice(&field_id.to_be_bytes());

-                        // addition only
-                        (field_id, None, add_value)
-                    }
-                    EitherOrBoth::Both(&field_id, _) => {
-                        // during settings update, recompute the changing settings only.
-                        if settings_diff.settings_update_only {
-                            continue;
-                        }
+                let document: [u8; 4] = docid_bytes[..4].try_into().ok().unwrap();
+                let document = DocumentId::from_be_bytes(document);

-                        let del_value = get_document_json_value(field_id, DelAdd::Deletion)?;
-                        let add_value = get_document_json_value(field_id, DelAdd::Addition)?;
+                // For the other extraction tasks, prefix the key with the field_id and the document_id
+                numbers_key_buffer.extend_from_slice(docid_bytes);
+                strings_key_buffer.extend_from_slice(docid_bytes);

-                        (field_id, del_value, add_value)
-                    }
+                let del_add_obkv = obkv::KvReader::new(field_bytes);
+                let del_value = match del_add_obkv.get(DelAdd::Deletion).filter(|_| delete_faceted)
+                {
+                    Some(bytes) => Some(from_slice(bytes).map_err(InternalError::SerdeJson)?),
+                    None => None,
+                };
+                let add_value = match del_add_obkv.get(DelAdd::Addition).filter(|_| add_faceted) {
+                    Some(bytes) => Some(from_slice(bytes).map_err(InternalError::SerdeJson)?),
+                    None => None,
                };

-                if del_value.is_some() || add_value.is_some() {
-                    numbers_key_buffer.clear();
-                    strings_key_buffer.clear();
+                // We insert the document id on the Del and the Add side if the field exists.
+                let (ref mut del_exists, ref mut add_exists) =
+                    facet_exists_docids.entry(field_id).or_default();
+                let (ref mut del_is_null, ref mut add_is_null) =
+                    facet_is_null_docids.entry(field_id).or_default();
+                let (ref mut del_is_empty, ref mut add_is_empty) =
+                    facet_is_empty_docids.entry(field_id).or_default();

-                    // Set key to the field_id
-                    // Note: this encoding is consistent with FieldIdCodec
-                    numbers_key_buffer.extend_from_slice(&field_id.to_be_bytes());
-                    strings_key_buffer.extend_from_slice(&field_id.to_be_bytes());
+                if del_value.is_some() {
+                    del_exists.insert(document);
+                }
+                if add_value.is_some() {
+                    add_exists.insert(document);
+                }

-                    let document: [u8; 4] = docid_bytes[..4].try_into().ok().unwrap();
-                    let document = DocumentId::from_be_bytes(document);
+                let geo_support =
+                    geo_fields_ids.map_or(false, |(lat, lng)| field_id == lat || field_id == lng);
+                let del_filterable_values =
+                    del_value.map(|value| extract_facet_values(&value, geo_support));
+                let add_filterable_values =
+                    add_value.map(|value| extract_facet_values(&value, geo_support));

-                    // For the other extraction tasks, prefix the key with the field_id and the document_id
-                    numbers_key_buffer.extend_from_slice(docid_bytes);
-                    strings_key_buffer.extend_from_slice(docid_bytes);
+                // Those closures are just here to simplify things a bit.
+                let mut insert_numbers_diff = |del_numbers, add_numbers| {
+                    insert_numbers_diff(
+                        &mut fid_docid_facet_numbers_sorter,
+                        &mut numbers_key_buffer,
+                        del_numbers,
+                        add_numbers,
+                    )
+                };
+                let mut insert_strings_diff = |del_strings, add_strings| {
+                    insert_strings_diff(
+                        &mut fid_docid_facet_strings_sorter,
+                        &mut strings_key_buffer,
+                        del_strings,
+                        add_strings,
+                    )
+                };

-                    // We insert the document id on the Del and the Add side if the field exists.
-                    let (ref mut del_exists, ref mut add_exists) =
-                        facet_exists_docids.entry(field_id).or_default();
-                    let (ref mut del_is_null, ref mut add_is_null) =
-                        facet_is_null_docids.entry(field_id).or_default();
-                    let (ref mut del_is_empty, ref mut add_is_empty) =
-                        facet_is_empty_docids.entry(field_id).or_default();
-
-                    if del_value.is_some() {
-                        del_exists.insert(document);
-                    }
-                    if add_value.is_some() {
-                        add_exists.insert(document);
-                    }
-
-                    let del_geo_support = settings_diff
-                        .old
-                        .geo_fields_ids
-                        .map_or(false, |(lat, lng)| field_id == lat || field_id == lng);
-                    let add_geo_support = settings_diff
-                        .new
-                        .geo_fields_ids
-                        .map_or(false, |(lat, lng)| field_id == lat || field_id == lng);
-                    let del_filterable_values =
-                        del_value.map(|value| extract_facet_values(&value, del_geo_support));
-                    let add_filterable_values =
-                        add_value.map(|value| extract_facet_values(&value, add_geo_support));
-
-                    // Those closures are just here to simplify things a bit.
-                    let mut insert_numbers_diff = |del_numbers, add_numbers| {
-                        insert_numbers_diff(
-                            &mut fid_docid_facet_numbers_sorter,
-                            &mut numbers_key_buffer,
-                            del_numbers,
-                            add_numbers,
-                        )
-                    };
-                    let mut insert_strings_diff = |del_strings, add_strings| {
-                        insert_strings_diff(
-                            &mut fid_docid_facet_strings_sorter,
-                            &mut strings_key_buffer,
-                            del_strings,
-                            add_strings,
-                        )
-                    };
-
-                    match (del_filterable_values, add_filterable_values) {
-                        (None, None) => (),
-                        (Some(del_filterable_values), None) => match del_filterable_values {
-                            Null => {
+                match (del_filterable_values, add_filterable_values) {
+                    (None, None) => (),
+                    (Some(del_filterable_values), None) => match del_filterable_values {
+                        Null => {
+                            del_is_null.insert(document);
+                        }
+                        Empty => {
+                            del_is_empty.insert(document);
+                        }
+                        Values { numbers, strings } => {
+                            insert_numbers_diff(numbers, vec![])?;
+                            insert_strings_diff(strings, vec![])?;
+                        }
+                    },
+                    (None, Some(add_filterable_values)) => match add_filterable_values {
+                        Null => {
+                            add_is_null.insert(document);
+                        }
+                        Empty => {
+                            add_is_empty.insert(document);
+                        }
+                        Values { numbers, strings } => {
+                            insert_numbers_diff(vec![], numbers)?;
+                            insert_strings_diff(vec![], strings)?;
+                        }
+                    },
+                    (Some(del_filterable_values), Some(add_filterable_values)) => {
+                        match (del_filterable_values, add_filterable_values) {
+                            (Null, Null) | (Empty, Empty) => (),
+                            (Null, Empty) => {
+                                del_is_null.insert(document);
+                                add_is_empty.insert(document);
+                            }
+                            (Empty, Null) => {
+                                del_is_empty.insert(document);
+                                add_is_null.insert(document);
+                            }
+                            (Null, Values { numbers, strings }) => {
+                                insert_numbers_diff(vec![], numbers)?;
+                                insert_strings_diff(vec![], strings)?;
                                del_is_null.insert(document);
                            }
-                            Empty => {
+                            (Empty, Values { numbers, strings }) => {
+                                insert_numbers_diff(vec![], numbers)?;
+                                insert_strings_diff(vec![], strings)?;
                                del_is_empty.insert(document);
                            }
-                            Values { numbers, strings } => {
+                            (Values { numbers, strings }, Null) => {
+                                add_is_null.insert(document);
                                insert_numbers_diff(numbers, vec![])?;
                                insert_strings_diff(strings, vec![])?;
                            }
-                        },
-                        (None, Some(add_filterable_values)) => match add_filterable_values {
-                            Null => {
-                                add_is_null.insert(document);
-                            }
-                            Empty => {
+                            (Values { numbers, strings }, Empty) => {
                                add_is_empty.insert(document);
+                                insert_numbers_diff(numbers, vec![])?;
+                                insert_strings_diff(strings, vec![])?;
                            }
-                            Values { numbers, strings } => {
-                                insert_numbers_diff(vec![], numbers)?;
-                                insert_strings_diff(vec![], strings)?;
-                            }
-                        },
-                        (Some(del_filterable_values), Some(add_filterable_values)) => {
-                            match (del_filterable_values, add_filterable_values) {
-                                (Null, Null) | (Empty, Empty) => (),
-                                (Null, Empty) => {
-                                    del_is_null.insert(document);
-                                    add_is_empty.insert(document);
-                                }
-                                (Empty, Null) => {
-                                    del_is_empty.insert(document);
-                                    add_is_null.insert(document);
-                                }
-                                (Null, Values { numbers, strings }) => {
-                                    insert_numbers_diff(vec![], numbers)?;
-                                    insert_strings_diff(vec![], strings)?;
-                                    del_is_null.insert(document);
-                                }
-                                (Empty, Values { numbers, strings }) => {
-                                    insert_numbers_diff(vec![], numbers)?;
-                                    insert_strings_diff(vec![], strings)?;
-                                    del_is_empty.insert(document);
-                                }
-                                (Values { numbers, strings }, Null) => {
-                                    add_is_null.insert(document);
-                                    insert_numbers_diff(numbers, vec![])?;
-                                    insert_strings_diff(strings, vec![])?;
-                                }
-                                (Values { numbers, strings }, Empty) => {
-                                    add_is_empty.insert(document);
-                                    insert_numbers_diff(numbers, vec![])?;
-                                    insert_strings_diff(strings, vec![])?;
-                                }
-                                (
-                                    Values { numbers: del_numbers, strings: del_strings },
-                                    Values { numbers: add_numbers, strings: add_strings },
-                                ) => {
-                                    insert_numbers_diff(del_numbers, add_numbers)?;
-                                    insert_strings_diff(del_strings, add_strings)?;
-                                }
+                            (
+                                Values { numbers: del_numbers, strings: del_strings },
+                                Values { numbers: add_numbers, strings: add_strings },
+                            ) => {
+                                insert_numbers_diff(del_numbers, add_numbers)?;
+                                insert_strings_diff(del_strings, add_strings)?;
                            }
                        }
                    }
--- a/milli/src/update/index_documents/extract/extract_geo_points.rs
+++ b/milli/src/update/index_documents/extract/extract_geo_points.rs
@@ -8,7 +8,6 @@ use super::helpers::{create_writer, writer_into_reader, GrenadParameters};
 use crate::error::GeoError;
 use crate::update::del_add::{DelAdd, KvReaderDelAdd, KvWriterDelAdd};
 use crate::update::index_documents::extract_finite_float_from_value;
-use crate::update::settings::{InnerIndexSettings, InnerIndexSettingsDiff};
 use crate::{FieldId, InternalError, Result};

 /// Extracts the geographical coordinates contained in each document under the `_geo` field.
@@ -19,7 +18,7 @@ pub fn extract_geo_points<R: io::Read + io::Seek>(
    obkv_documents: grenad::Reader<R>,
    indexer: GrenadParameters,
    primary_key_id: FieldId,
-    settings_diff: &InnerIndexSettingsDiff,
+    (lat_fid, lng_fid): (FieldId, FieldId),
 ) -> Result<grenad::Reader<BufReader<File>>> {
    let mut writer = create_writer(
        indexer.chunk_compression_type,
@@ -39,27 +38,47 @@ pub fn extract_geo_points<R: io::Read + io::Seek>(
            serde_json::from_slice(document_id).unwrap()
        };

-        // extract old version
-        let del_lat_lng =
-            extract_lat_lng(&obkv, &settings_diff.old, DelAdd::Deletion, document_id)?;
-        // extract new version
-        let add_lat_lng =
-            extract_lat_lng(&obkv, &settings_diff.new, DelAdd::Addition, document_id)?;
+        // first we get the two fields
+        match (obkv.get(lat_fid), obkv.get(lng_fid)) {
+            (Some(lat), Some(lng)) => {
+                let deladd_lat_obkv = KvReaderDelAdd::new(lat);
+                let deladd_lng_obkv = KvReaderDelAdd::new(lng);

-        if del_lat_lng != add_lat_lng {
-            let mut obkv = KvWriterDelAdd::memory();
-            if let Some([lat, lng]) = del_lat_lng {
-                #[allow(clippy::drop_non_drop)]
-                let bytes: [u8; 16] = concat_arrays![lat.to_ne_bytes(), lng.to_ne_bytes()];
-                obkv.insert(DelAdd::Deletion, bytes)?;
+                // then we extract the values
+                let del_lat_lng = deladd_lat_obkv
+                    .get(DelAdd::Deletion)
+                    .zip(deladd_lng_obkv.get(DelAdd::Deletion))
+                    .map(|(lat, lng)| extract_lat_lng(lat, lng, document_id))
+                    .transpose()?;
+                let add_lat_lng = deladd_lat_obkv
+                    .get(DelAdd::Addition)
+                    .zip(deladd_lng_obkv.get(DelAdd::Addition))
+                    .map(|(lat, lng)| extract_lat_lng(lat, lng, document_id))
+                    .transpose()?;
+
+                if del_lat_lng != add_lat_lng {
+                    let mut obkv = KvWriterDelAdd::memory();
+                    if let Some([lat, lng]) = del_lat_lng {
+                        #[allow(clippy::drop_non_drop)]
+                        let bytes: [u8; 16] = concat_arrays![lat.to_ne_bytes(), lng.to_ne_bytes()];
+                        obkv.insert(DelAdd::Deletion, bytes)?;
+                    }
+                    if let Some([lat, lng]) = add_lat_lng {
+                        #[allow(clippy::drop_non_drop)]
+                        let bytes: [u8; 16] = concat_arrays![lat.to_ne_bytes(), lng.to_ne_bytes()];
+                        obkv.insert(DelAdd::Addition, bytes)?;
+                    }
+                    let bytes = obkv.into_inner()?;
+                    writer.insert(docid_bytes, bytes)?;
+                }
            }
-            if let Some([lat, lng]) = add_lat_lng {
-                #[allow(clippy::drop_non_drop)]
-                let bytes: [u8; 16] = concat_arrays![lat.to_ne_bytes(), lng.to_ne_bytes()];
-                obkv.insert(DelAdd::Addition, bytes)?;
+            (None, Some(_)) => {
+                return Err(GeoError::MissingLatitude { document_id: document_id() }.into())
            }
-            let bytes = obkv.into_inner()?;
-            writer.insert(docid_bytes, bytes)?;
+            (Some(_), None) => {
+                return Err(GeoError::MissingLongitude { document_id: document_id() }.into())
+            }
+            (None, None) => (),
        }
    }

@@ -67,37 +86,16 @@ pub fn extract_geo_points<R: io::Read + io::Seek>(
 }

 /// Extract the finite floats lat and lng from two bytes slices.
-fn extract_lat_lng(
-    document: &obkv::KvReader<FieldId>,
-    settings: &InnerIndexSettings,
-    deladd: DelAdd,
-    document_id: impl Fn() -> Value,
-) -> Result<Option<[f64; 2]>> {
-    match settings.geo_fields_ids {
-        Some((lat_fid, lng_fid)) => {
-            let lat = document.get(lat_fid).map(KvReaderDelAdd::new).and_then(|r| r.get(deladd));
-            let lng = document.get(lng_fid).map(KvReaderDelAdd::new).and_then(|r| r.get(deladd));
-            let (lat, lng) = match (lat, lng) {
-                (Some(lat), Some(lng)) => (lat, lng),
-                (Some(_), None) => {
-                    return Err(GeoError::MissingLatitude { document_id: document_id() }.into())
-                }
-                (None, Some(_)) => {
-                    return Err(GeoError::MissingLongitude { document_id: document_id() }.into())
-                }
-                (None, None) => return Ok(None),
-            };
-            let lat = extract_finite_float_from_value(
-                serde_json::from_slice(lat).map_err(InternalError::SerdeJson)?,
-            )
-            .map_err(|lat| GeoError::BadLatitude { document_id: document_id(), value: lat })?;
+fn extract_lat_lng(lat: &[u8], lng: &[u8], document_id: impl Fn() -> Value) -> Result<[f64; 2]> {
+    let lat = extract_finite_float_from_value(
+        serde_json::from_slice(lat).map_err(InternalError::SerdeJson)?,
+    )
+    .map_err(|lat| GeoError::BadLatitude { document_id: document_id(), value: lat })?;

-            let lng = extract_finite_float_from_value(
-                serde_json::from_slice(lng).map_err(InternalError::SerdeJson)?,
-            )
-            .map_err(|lng| GeoError::BadLongitude { document_id: document_id(), value: lng })?;
-            Ok(Some([lat, lng]))
-        }
-        None => Ok(None),
-    }
+    let lng = extract_finite_float_from_value(
+        serde_json::from_slice(lng).map_err(InternalError::SerdeJson)?,
+    )
+    .map_err(|lng| GeoError::BadLongitude { document_id: document_id(), value: lng })?;
+
+    Ok([lat, lng])
 }
--- a/milli/src/update/index_documents/extract/extract_word_pair_proximity_docids.rs
+++ b/milli/src/update/index_documents/extract/extract_word_pair_proximity_docids.rs
@@ -26,8 +26,11 @@ pub fn extract_word_pair_proximity_docids<R: io::Read + io::Seek>(
    indexer: GrenadParameters,
    settings_diff: &InnerIndexSettingsDiff,
 ) -> Result<grenad::Reader<BufReader<File>>> {
+    let any_deletion = settings_diff.old.proximity_precision == ProximityPrecision::ByWord;
+    let any_addition = settings_diff.new.proximity_precision == ProximityPrecision::ByWord;
+
    // early return if the data shouldn't be deleted nor created.
-    if settings_diff.settings_update_only && !settings_diff.reindex_proximities() {
+    if !any_deletion && !any_addition {
        let writer = create_writer(
            indexer.chunk_compression_type,
            indexer.chunk_compression_level,
@@ -36,10 +39,8 @@ pub fn extract_word_pair_proximity_docids<R: io::Read + io::Seek>(
        return writer_into_reader(writer);
    }

-    let any_deletion = settings_diff.old.proximity_precision == ProximityPrecision::ByWord;
-    let any_addition = settings_diff.new.proximity_precision == ProximityPrecision::ByWord;
-
    let max_memory = indexer.max_memory_by_thread();
+
    let mut word_pair_proximity_docids_sorters: Vec<_> = (1..MAX_DISTANCE)
        .map(|_| {
            create_sorter(
--- a/milli/src/update/index_documents/extract/mod.rs
+++ b/milli/src/update/index_documents/extract/mod.rs
@@ -43,6 +43,7 @@ pub(crate) fn data_from_obkv_documents(
    indexer: GrenadParameters,
    lmdb_writer_sx: Sender<Result<TypedChunk>>,
    primary_key_id: FieldId,
+    geo_fields_ids: Option<(FieldId, FieldId)>,
    settings_diff: Arc<InnerIndexSettingsDiff>,
    max_positions_per_attributes: Option<u32>,
 ) -> Result<()> {
@@ -69,6 +70,7 @@ pub(crate) fn data_from_obkv_documents(
                        indexer,
                        lmdb_writer_sx.clone(),
                        primary_key_id,
+                        geo_fields_ids,
                        settings_diff.clone(),
                        max_positions_per_attributes,
                    )
@@ -291,6 +293,7 @@ fn send_and_extract_flattened_documents_data(
    indexer: GrenadParameters,
    lmdb_writer_sx: Sender<Result<TypedChunk>>,
    primary_key_id: FieldId,
+    geo_fields_ids: Option<(FieldId, FieldId)>,
    settings_diff: Arc<InnerIndexSettingsDiff>,
    max_positions_per_attributes: Option<u32>,
 ) -> Result<(
@@ -300,13 +303,12 @@ fn send_and_extract_flattened_documents_data(
    let flattened_documents_chunk =
        flattened_documents_chunk.and_then(|c| unsafe { as_cloneable_grenad(&c) })?;

-    if settings_diff.run_geo_indexing() {
+    if let Some(geo_fields_ids) = geo_fields_ids {
        let documents_chunk_cloned = flattened_documents_chunk.clone();
        let lmdb_writer_sx_cloned = lmdb_writer_sx.clone();
-        let settings_diff = settings_diff.clone();
        rayon::spawn(move || {
            let result =
-                extract_geo_points(documents_chunk_cloned, indexer, primary_key_id, &settings_diff);
+                extract_geo_points(documents_chunk_cloned, indexer, primary_key_id, geo_fields_ids);
            let _ = match result {
                Ok(geo_points) => lmdb_writer_sx_cloned.send(Ok(TypedChunk::GeoPoints(geo_points))),
                Err(error) => lmdb_writer_sx_cloned.send(Err(error)),
@@ -345,6 +347,7 @@ fn send_and_extract_flattened_documents_data(
                    flattened_documents_chunk.clone(),
                    indexer,
                    &settings_diff,
+                    geo_fields_ids,
                )?;

                // send fid_docid_facet_numbers_chunk to DB writer
--- a/milli/src/update/index_documents/mod.rs
+++ b/milli/src/update/index_documents/mod.rs
@@ -315,6 +315,28 @@ where
        // get the primary key field id
        let primary_key_id = settings_diff.new.fields_ids_map.id(&primary_key).unwrap();

+        // get the fid of the `_geo.lat` and `_geo.lng` fields.
+        let mut field_id_map = self.index.fields_ids_map(self.wtxn)?;
+
+        // self.index.fields_ids_map($a)? ==>> field_id_map
+        let geo_fields_ids = match field_id_map.id("_geo") {
+            Some(gfid) => {
+                let is_sortable = self.index.sortable_fields_ids(self.wtxn)?.contains(&gfid);
+                let is_filterable = self.index.filterable_fields_ids(self.wtxn)?.contains(&gfid);
+                // if `_geo` is faceted then we get the `lat` and `lng`
+                if is_sortable || is_filterable {
+                    let field_ids = field_id_map
+                        .insert("_geo.lat")
+                        .zip(field_id_map.insert("_geo.lng"))
+                        .ok_or(UserError::AttributeLimitReached)?;
+                    Some(field_ids)
+                } else {
+                    None
+                }
+            }
+            None => None,
+        };
+
        let pool_params = GrenadParameters {
            chunk_compression_type: self.indexer_config.chunk_compression_type,
            chunk_compression_level: self.indexer_config.chunk_compression_level,
@@ -369,7 +391,6 @@ where

        // Run extraction pipeline in parallel.
        pool.install(|| {
-            let settings_diff_cloned = settings_diff.clone();
            rayon::spawn(move || {
                let child_span = tracing::trace_span!(target: "indexing::details", parent: &current_span, "extract_and_send_grenad_chunks");
                let _enter = child_span.enter();
@@ -399,7 +420,8 @@ where
                        pool_params,
                        lmdb_writer_sx.clone(),
                        primary_key_id,
-                        settings_diff_cloned,
+                        geo_fields_ids,
+                        settings_diff.clone(),
                        max_positions_per_attributes,
                    )
                });
@@ -426,7 +448,7 @@ where
                    Err(status) => {
                        if let Some(typed_chunks) = chunk_accumulator.pop_longest() {
                            let (docids, is_merged_database) =
-                                write_typed_chunk_into_index(self.wtxn, self.index, &settings_diff, typed_chunks)?;
+                                write_typed_chunk_into_index(typed_chunks, self.index, self.wtxn)?;
                            if !docids.is_empty() {
                                final_documents_ids |= docids;
                                let documents_seen_count = final_documents_ids.len();
--- a/milli/src/update/index_documents/transform.rs
+++ b/milli/src/update/index_documents/transform.rs
@@ -20,10 +20,7 @@ use super::{IndexDocumentsMethod, IndexerConfig};
 use crate::documents::{DocumentsBatchIndex, EnrichedDocument, EnrichedDocumentsBatchReader};
 use crate::error::{Error, InternalError, UserError};
 use crate::index::{db_name, main_key};
-use crate::update::del_add::{
-    into_del_add_obkv, into_del_add_obkv_conditional_operation, DelAdd, DelAddOperation,
-    KvReaderDelAdd,
-};
+use crate::update::del_add::{into_del_add_obkv, DelAdd, DelAddOperation, KvReaderDelAdd};
 use crate::update::index_documents::GrenadParameters;
 use crate::update::settings::{InnerIndexSettings, InnerIndexSettingsDiff};
 use crate::update::{AvailableDocumentsIds, UpdateIndexingStep};
@@ -808,15 +805,13 @@ impl<'a, 'i> Transform<'a, 'i> {
        let mut new_inner_settings = old_inner_settings.clone();
        new_inner_settings.fields_ids_map = fields_ids_map;

-        let embedding_configs_updated = false;
-        let settings_update_only = false;
-        let settings_diff = InnerIndexSettingsDiff::new(
-            old_inner_settings,
-            new_inner_settings,
+        let settings_diff = InnerIndexSettingsDiff {
+            old: old_inner_settings,
+            new: new_inner_settings,
            primary_key_id,
-            embedding_configs_updated,
-            settings_update_only,
-        );
+            embedding_configs_updated: false,
+            settings_update_only: false,
+        };

        Ok(TransformOutput {
            primary_key,
@@ -845,6 +840,14 @@ impl<'a, 'i> Transform<'a, 'i> {
        // Always keep the primary key.
        let is_primary_key = |id: FieldId| -> bool { settings_diff.primary_key_id == Some(id) };

+        // If only the `searchableAttributes` has been changed, keep only the searchable fields.
+        let must_reindex_searchables = settings_diff.reindex_searchable();
+        let necessary_searchable_field = |id: FieldId| -> bool {
+            must_reindex_searchables
+                && (settings_diff.old.searchable_fields_ids.contains(&id)
+                    || settings_diff.new.searchable_fields_ids.contains(&id))
+        };
+
        // If only a faceted field has been added, keep only this field.
        let must_reindex_facets = settings_diff.reindex_facets();
        let necessary_faceted_field = |id: FieldId| -> bool {
@@ -859,16 +862,13 @@ impl<'a, 'i> Transform<'a, 'i> {
        // we need the fields for the prompt/templating.
        let reindex_vectors = settings_diff.reindex_vectors();

-        // The operations that we must perform on the different fields.
-        let mut operations = HashMap::new();
-
        let mut obkv_writer = KvWriter::<_, FieldId>::memory();
        for (id, val) in old_obkv.iter() {
-            if is_primary_key(id) || necessary_faceted_field(id) || reindex_vectors {
-                operations.insert(id, DelAddOperation::DeletionAndAddition);
-                obkv_writer.insert(id, val)?;
-            } else if let Some(operation) = settings_diff.reindex_searchable_id(id) {
-                operations.insert(id, operation);
+            if is_primary_key(id)
+                || necessary_searchable_field(id)
+                || necessary_faceted_field(id)
+                || reindex_vectors
+            {
                obkv_writer.insert(id, val)?;
            }
        }
@@ -887,9 +887,11 @@ impl<'a, 'i> Transform<'a, 'i> {
            let flattened = flattened.as_deref().map_or(obkv, KvReader::new);

            flattened_obkv_buffer.clear();
-            into_del_add_obkv_conditional_operation(flattened, flattened_obkv_buffer, |id| {
-                operations.get(&id).copied().unwrap_or(DelAddOperation::DeletionAndAddition)
-            })?;
+            into_del_add_obkv(
+                flattened,
+                DelAddOperation::DeletionAndAddition,
+                flattened_obkv_buffer,
+            )?;
        }

        Ok(())
@@ -899,11 +901,6 @@ impl<'a, 'i> Transform<'a, 'i> {
    /// of the index with the attributes reordered accordingly to the `FieldsIdsMap` given as argument.
    ///
    // TODO this can be done in parallel by using the rayon `ThreadPool`.
-    #[tracing::instrument(
-        level = "trace"
-        skip(self, wtxn, settings_diff),
-        target = "indexing::documents"
-    )]
    pub fn prepare_for_documents_reindexing(
        self,
        wtxn: &mut heed::RwTxn<'i>,
--- a/milli/src/update/index_documents/typed_chunk.rs
+++ b/milli/src/update/index_documents/typed_chunk.rs
@@ -7,7 +7,7 @@ use bytemuck::allocation::pod_collect_to_vec;
 use charabia::{Language, Script};
 use grenad::{Merger, MergerBuilder};
 use heed::types::Bytes;
-use heed::{BytesDecode, RwTxn};
+use heed::RwTxn;
 use obkv::{KvReader, KvWriter};
 use roaring::RoaringBitmap;

@@ -20,16 +20,13 @@ use super::MergeFn;
 use crate::external_documents_ids::{DocumentOperation, DocumentOperationKind};
 use crate::facet::FacetType;
 use crate::index::db_name::DOCUMENTS;
-use crate::proximity::MAX_DISTANCE;
 use crate::update::del_add::{deladd_serialize_add_side, DelAdd, KvReaderDelAdd};
 use crate::update::facet::FacetsUpdate;
 use crate::update::index_documents::helpers::{
    as_cloneable_grenad, keep_latest_obkv, try_split_array_at,
 };
-use crate::update::settings::InnerIndexSettingsDiff;
 use crate::{
-    lat_lng_to_xyz, CboRoaringBitmapCodec, DocumentId, FieldId, GeoPoint, Index, InternalError,
-    Result, SerializationError, U8StrStrCodec,
+    lat_lng_to_xyz, DocumentId, FieldId, GeoPoint, Index, InternalError, Result, SerializationError,
 };

 /// This struct accumulates and group the TypedChunks
@@ -125,10 +122,9 @@ impl TypedChunk {
 /// Return new documents seen.
 #[tracing::instrument(level = "trace", skip_all, target = "indexing::write_db")]
 pub(crate) fn write_typed_chunk_into_index(
-    wtxn: &mut RwTxn,
-    index: &Index,
-    settings_diff: &InnerIndexSettingsDiff,
    typed_chunks: Vec<TypedChunk>,
+    index: &Index,
+    wtxn: &mut RwTxn,
 ) -> Result<(RoaringBitmap, bool)> {
    let mut is_merged_database = false;
    match typed_chunks[0] {
@@ -489,22 +485,13 @@ pub(crate) fn write_typed_chunk_into_index(
            }
            let merger = builder.build();

-            if settings_diff.only_additional_fields.is_some() {
-                write_proximity_entries_into_database_additional_searchables(
-                    merger,
-                    &index.word_pair_proximity_docids,
-                    wtxn,
-                )?;
-            } else {
-                write_entries_into_database(
-                    merger,
-                    &index.word_pair_proximity_docids,
-                    wtxn,
-                    deladd_serialize_add_side,
-                    merge_deladd_cbo_roaring_bitmaps_into_cbo_roaring_bitmap,
-                )?;
-            }
-
+            write_entries_into_database(
+                merger,
+                &index.word_pair_proximity_docids,
+                wtxn,
+                deladd_serialize_add_side,
+                merge_deladd_cbo_roaring_bitmaps_into_cbo_roaring_bitmap,
+            )?;
            is_merged_database = true;
        }
        TypedChunk::FieldIdDocidFacetNumbers(_) => {
@@ -843,51 +830,3 @@ where
    }
    Ok(())
 }
-
-/// Akin to the `write_entries_into_database` function but specialized
-/// for the case when we only index additional searchable fields only.
-#[tracing::instrument(level = "trace", skip_all, target = "indexing::write_db")]
-fn write_proximity_entries_into_database_additional_searchables<R>(
-    merger: Merger<R, MergeFn>,
-    database: &heed::Database<U8StrStrCodec, CboRoaringBitmapCodec>,
-    wtxn: &mut RwTxn,
-) -> Result<()>
-where
-    R: io::Read + io::Seek,
-{
-    let mut iter = merger.into_stream_merger_iter()?;
-    while let Some((key, value)) = iter.next()? {
-        if valid_lmdb_key(key) {
-            let (proximity_to_insert, word1, word2) =
-                U8StrStrCodec::bytes_decode(key).map_err(heed::Error::Decoding)?;
-            let data_to_insert = match KvReaderDelAdd::new(value).get(DelAdd::Addition) {
-                Some(value) => {
-                    CboRoaringBitmapCodec::bytes_decode(value).map_err(heed::Error::Decoding)?
-                }
-                None => continue,
-            };
-
-            let mut data_to_remove = RoaringBitmap::new();
-            for prox in 1..(MAX_DISTANCE as u8) {
-                let key = (prox, word1, word2);
-                let database_value = database.get(wtxn, &key)?.unwrap_or_default();
-                let value = if prox == proximity_to_insert {
-                    // Proximity that should be changed.
-                    // Union values and remove lower proximity data
-                    (&database_value | &data_to_insert) - &data_to_remove
-                } else {
-                    // Remove lower proximity data
-                    &database_value - &data_to_remove
-                };
-
-                // add the current data in data_to_remove for the next proximities
-                data_to_remove |= &value;
-
-                if database_value != value {
-                    database.put(wtxn, &key, &value)?;
-                }
-            }
-        }
-    }
-    Ok(())
-}
--- a/milli/src/update/settings.rs
+++ b/milli/src/update/settings.rs
@@ -9,7 +9,6 @@ use itertools::{EitherOrBoth, Itertools};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use time::OffsetDateTime;

-use super::del_add::DelAddOperation;
 use super::index_documents::{IndexDocumentsConfig, Transform};
 use super::IndexerConfig;
 use crate::criterion::Criterion;
@@ -1073,14 +1072,13 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> {
            .index
            .primary_key(self.wtxn)?
            .and_then(|name| new_inner_settings.fields_ids_map.id(name));
-        let settings_update_only = true;
-        let inner_settings_diff = InnerIndexSettingsDiff::new(
-            old_inner_settings,
-            new_inner_settings,
+        let inner_settings_diff = InnerIndexSettingsDiff {
+            old: old_inner_settings,
+            new: new_inner_settings,
            primary_key_id,
            embedding_configs_updated,
-            settings_update_only,
-        );
+            settings_update_only: true,
+        };

        if inner_settings_diff.any_reindexing_needed() {
            self.reindex(&progress_callback, &should_abort, inner_settings_diff)?;
@@ -1097,104 +1095,21 @@ pub struct InnerIndexSettingsDiff {
    // TODO: compare directly the embedders.
    pub(crate) embedding_configs_updated: bool,
    pub(crate) settings_update_only: bool,
-    /// The set of only the additional searchable fields.
-    /// If any other searchable field has been modified, is set to None.
-    pub(crate) only_additional_fields: Option<HashSet<String>>,
-
-    // Cache the check to see if all the stop_words, allowed_separators, dictionary,
-    // exact_attributes, proximity_precision are different.
-    pub(crate) cache_reindex_searchable_without_user_defined: bool,
-    // Cache the check to see if the user_defined_searchables are different.
-    pub(crate) cache_user_defined_searchables: bool,
-    // Cache the check to see if the exact_attributes are different.
-    pub(crate) cache_exact_attributes: bool,
 }

 impl InnerIndexSettingsDiff {
-    #[tracing::instrument(level = "trace", skip_all, target = "indexing::settings")]
-    pub(crate) fn new(
-        old_settings: InnerIndexSettings,
-        new_settings: InnerIndexSettings,
-        primary_key_id: Option<FieldId>,
-        embedding_configs_updated: bool,
-        settings_update_only: bool,
-    ) -> Self {
-        let only_additional_fields = match (
-            &old_settings.user_defined_searchable_fields,
-            &new_settings.user_defined_searchable_fields,
-        ) {
-            (None, None) | (Some(_), None) | (None, Some(_)) => None, // None means *
-            (Some(old), Some(new)) => {
-                let old: HashSet<_> = old.iter().cloned().collect();
-                let new: HashSet<_> = new.iter().cloned().collect();
-                if old.difference(&new).next().is_none() {
-                    // if no field has been removed return only the additional ones
-                    Some(&new - &old).filter(|x| !x.is_empty())
-                } else {
-                    None
-                }
-            }
-        };
-
-        let cache_reindex_searchable_without_user_defined = {
-            old_settings.stop_words.as_ref().map(|set| set.as_fst().as_bytes())
-                != new_settings.stop_words.as_ref().map(|set| set.as_fst().as_bytes())
-                || old_settings.allowed_separators != new_settings.allowed_separators
-                || old_settings.dictionary != new_settings.dictionary
-                || old_settings.proximity_precision != new_settings.proximity_precision
-        };
-
-        let cache_exact_attributes = old_settings.exact_attributes != new_settings.exact_attributes;
-
-        let cache_user_defined_searchables = old_settings.user_defined_searchable_fields
-            != new_settings.user_defined_searchable_fields;
-
-        InnerIndexSettingsDiff {
-            old: old_settings,
-            new: new_settings,
-            primary_key_id,
-            embedding_configs_updated,
-            settings_update_only,
-            only_additional_fields,
-            cache_reindex_searchable_without_user_defined,
-            cache_user_defined_searchables,
-            cache_exact_attributes,
-        }
-    }
-
    pub fn any_reindexing_needed(&self) -> bool {
        self.reindex_searchable() || self.reindex_facets() || self.reindex_vectors()
    }

    pub fn reindex_searchable(&self) -> bool {
-        self.cache_reindex_searchable_without_user_defined
-            || self.cache_exact_attributes
-            || self.cache_user_defined_searchables
-    }
-
-    pub fn reindex_proximities(&self) -> bool {
-        // if any searchable settings force the reindexing
-        (self.cache_reindex_searchable_without_user_defined || self.cache_user_defined_searchables)
-        // and if any settings needs the proximity database created
-            && (self.old.proximity_precision == ProximityPrecision::ByAttribute
-                || self.new.proximity_precision == ProximityPrecision::ByAttribute)
-    }
-
-    pub fn reindex_searchable_id(&self, id: FieldId) -> Option<DelAddOperation> {
-        if self.cache_reindex_searchable_without_user_defined || self.cache_exact_attributes {
-            Some(DelAddOperation::DeletionAndAddition)
-        } else if let Some(only_additional_fields) = &self.only_additional_fields {
-            let additional_field = self.new.fields_ids_map.name(id).unwrap();
-            if only_additional_fields.contains(additional_field) {
-                Some(DelAddOperation::Addition)
-            } else {
-                None
-            }
-        } else if self.cache_user_defined_searchables {
-            Some(DelAddOperation::DeletionAndAddition)
-        } else {
-            None
-        }
+        self.old.stop_words.as_ref().map(|set| set.as_fst().as_bytes())
+            != self.new.stop_words.as_ref().map(|set| set.as_fst().as_bytes())
+            || self.old.allowed_separators != self.new.allowed_separators
+            || self.old.dictionary != self.new.dictionary
+            || self.old.user_defined_searchable_fields != self.new.user_defined_searchable_fields
+            || self.old.exact_attributes != self.new.exact_attributes
+            || self.old.proximity_precision != self.new.proximity_precision
    }

    pub fn reindex_facets(&self) -> bool {
@@ -1227,11 +1142,6 @@ impl InnerIndexSettingsDiff {
        self.settings_update_only
    }

-    pub fn run_geo_indexing(&self) -> bool {
-        self.old.geo_fields_ids != self.new.geo_fields_ids
-            || (!self.settings_update_only && self.new.geo_fields_ids.is_some())
-    }
-
    pub fn modified_faceted_fields(&self) -> HashSet<String> {
        &self.old.user_defined_faceted_fields ^ &self.new.user_defined_faceted_fields
    }
@@ -1251,7 +1161,6 @@ pub(crate) struct InnerIndexSettings {
    pub proximity_precision: ProximityPrecision,
    pub embedding_configs: EmbeddingConfigs,
    pub existing_fields: HashSet<String>,
-    pub geo_fields_ids: Option<(FieldId, FieldId)>,
 }

 impl InnerIndexSettings {
@@ -1260,7 +1169,7 @@ impl InnerIndexSettings {
        let stop_words = stop_words.map(|sw| sw.map_data(Vec::from).unwrap());
        let allowed_separators = index.allowed_separators(rtxn)?;
        let dictionary = index.dictionary(rtxn)?;
-        let mut fields_ids_map = index.fields_ids_map(rtxn)?;
+        let fields_ids_map = index.fields_ids_map(rtxn)?;
        let user_defined_searchable_fields = index.user_defined_searchable_fields(rtxn)?;
        let user_defined_searchable_fields =
            user_defined_searchable_fields.map(|sf| sf.into_iter().map(String::from).collect());
@@ -1275,24 +1184,6 @@ impl InnerIndexSettings {
            .into_iter()
            .filter_map(|(field, count)| (count != 0).then_some(field))
            .collect();
-        // index.fields_ids_map($a)? ==>> fields_ids_map
-        let geo_fields_ids = match fields_ids_map.id("_geo") {
-            Some(gfid) => {
-                let is_sortable = index.sortable_fields_ids(rtxn)?.contains(&gfid);
-                let is_filterable = index.filterable_fields_ids(rtxn)?.contains(&gfid);
-                // if `_geo` is faceted then we get the `lat` and `lng`
-                if is_sortable || is_filterable {
-                    let field_ids = fields_ids_map
-                        .insert("_geo.lat")
-                        .zip(fields_ids_map.insert("_geo.lng"))
-                        .ok_or(UserError::AttributeLimitReached)?;
-                    Some(field_ids)
-                } else {
-                    None
-                }
-            }
-            None => None,
-        };

        Ok(Self {
            stop_words,
@@ -1307,7 +1198,6 @@ impl InnerIndexSettings {
            proximity_precision,
            embedding_configs,
            existing_fields,
-            geo_fields_ids,
        })
    }

@@ -1665,7 +1555,7 @@ mod tests {
        // When we search for something that is not in
        // the searchable fields it must not return any document.
        let result = index.search(&rtxn).query("23").execute().unwrap();
-        assert_eq!(result.documents_ids, Vec::<u32>::new());
+        assert!(result.documents_ids.is_empty());

        // When we search for something that is in the searchable fields
        // we must find the appropriate document.
--- a/milli/tests/search/mod.rs
+++ b/milli/tests/search/mod.rs
@@ -159,7 +159,6 @@ pub fn expected_order(

    match optional_words {
        TermsMatchingStrategy::Last => groups.into_iter().flatten().collect(),
-        TermsMatchingStrategy::Frequency => groups.into_iter().flatten().collect(),
        TermsMatchingStrategy::All => {
            groups.into_iter().flatten().filter(|d| d.word_rank == 0).collect()
        }
--- a/workloads/movies-subset-hf-embeddings.json
+++ b/workloads/movies-subset-hf-embeddings.json
--- a/workloads/settings-add-embeddings.json
+++ b/workloads/settings-add-embeddings.json