From 6935589f74ebaae3ac4bb5a7839b026f77e26c2f Mon Sep 17 00:00:00 2001 From: Tamo Date: Thu, 25 Sep 2025 10:31:07 +0200 Subject: [PATCH] use the latest version of zerometry that supports collection, lines and multi-lines --- Cargo.lock | 31 ++--------------- .../tests/documents/geojson/mod.rs | 33 +++++++++++++++++++ crates/milli/Cargo.toml | 2 +- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af5a230f9..e2f46723f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1092,7 +1092,7 @@ dependencies = [ "steppe", "thiserror 2.0.16", "thread_local", - "zerometry 0.3.0", + "zerometry", ] [[package]] @@ -2577,7 +2577,6 @@ dependencies = [ "num-traits", "robust", "rstar", - "spade", ] [[package]] @@ -2588,7 +2587,6 @@ checksum = "75a4dcd69d35b2c87a7c83bce9af69fd65c9d68d3833a0ded568983928f3fc99" dependencies = [ "approx", "num-traits", - "rayon", "rstar", "serde", ] @@ -3060,7 +3058,6 @@ dependencies = [ "i_key_sort", "i_shape", "i_tree", - "rayon", ] [[package]] @@ -4275,7 +4272,7 @@ dependencies = [ "url", "utoipa", "uuid", - "zerometry 0.1.0", + "zerometry", ] [[package]] @@ -6145,18 +6142,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "spade" -version = "2.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb313e1c8afee5b5647e00ee0fe6855e3d529eb863a0fdae1d60006c4d1e9990" -dependencies = [ - "hashbrown 0.15.5", - "num-traits", - "robust", - "smallvec", -] - [[package]] name = "spin" version = "0.5.2" @@ -7983,18 +7968,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "zerometry" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681f08f3f4ef27d3021a128eb6d8df1cd781e4c9c797c3971c1f85316374f977" -dependencies = [ - "bytemuck", - "byteorder", - "geo", - "geo-types", -] - [[package]] name = "zerometry" version = "0.3.0" diff --git a/crates/meilisearch/tests/documents/geojson/mod.rs b/crates/meilisearch/tests/documents/geojson/mod.rs index 334076222..d0dd5321a 100644 --- a/crates/meilisearch/tests/documents/geojson/mod.rs +++ b/crates/meilisearch/tests/documents/geojson/mod.rs @@ -418,3 +418,36 @@ async fn geo_radius() { } "#); } + +#[actix_rt::test] +async fn bug_5904() { + // https://github.com/meilisearch/meilisearch/issues/5904 + + let server = Server::new_shared(); + let index = server.unique_index(); + let (response, _code) = + index.update_settings(json!({"filterableAttributes": ["_geojson"]})).await; + server.wait_task(response.uid()).await.succeeded(); + + let geojson = json!({ + "id": 1, + "_geojson": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 4.23914, + 48.382893 + ] + }, + "properties": {} + } + ] + } + }); + let (response, _code) = index.add_documents(geojson, Some("id")).await; + server.wait_task(response.uid()).await.succeeded(); +} diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index b5b770bc4..417a374a3 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -119,7 +119,7 @@ twox-hash = { version = "2.1.1", default-features = false, features = [ "xxhash64", ] } geo-types = "0.7.16" -zerometry = "0.1.0" +zerometry = "0.3.0" [dev-dependencies] mimalloc = { version = "0.1.47", default-features = false }