Skip to content

Use heed v0.22.1-nested-rtxns #18

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Use heed v0.22.1-nested-rtxns #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b43f18e
Use heed v0.22.1-nested-rtxns
Kerollmops Oct 1, 2025
d17a929
Fix the tests
Kerollmops Oct 1, 2025
d02da8e
Exclude readme assets
Kerollmops Oct 1, 2025
6a481c7
Change version
dureuill Oct 9, 2025
0ab09b6
Don't check version
dureuill Oct 9, 2025
252df61
Merge pull request #19 from meilisearch/use-heed-nested-rtxns-skip-ve…
Kerollmops Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cellulite"
version = "0.3.0"
version = "0.3.1-nested-rtxns-2"
edition = "2024"
license-file = "LICENSE"
description = "Store and retrieve geojson in a memory mapped database"
Expand All @@ -9,7 +9,7 @@ repository = "https://github.com/irevoire/cellulite"
authors = ["Tamo <tamo@meilisearch.com>"]
keywords = ["geo", "geography", "database"]

exclude = ["assets"]
exclude = ["assets", "readme_assets"]

[workspace]
members = [ "benchmarks","examples/*"]
Expand All @@ -20,7 +20,7 @@ geo = { version = "0.30.0", default-features = false, features = ["earcutr"] }
geojson = "0.24.2"
geo-types = "0.7.15"
h3o = { version = "0.9.0", features = ["geo"] }
heed = "0.22.0"
heed = { version = "0.22.1-nested-rtxns", default-features = false }
ordered-float = "5.0.0"
roaring = "0.11.1"
thiserror = "2.0.12"
Expand Down
5 changes: 0 additions & 5 deletions src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@ impl Cellulite {
cancel: &(impl Fn() -> bool + Send + Sync),
progress: &impl Progress,
) -> Result<()> {
let db_version = self.get_version(wtxn)?;
if db_version != Version::default() {
return Err(Error::VersionMismatchOnBuild(db_version));
}

// 1.
let (inserted_items, removed_items) =
self.retrieve_and_clear_updated_items(wtxn, cancel, progress)?;
Expand Down
72 changes: 36 additions & 36 deletions src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,23 @@ fn basic_write() {
])));
db.add(&mut wtxn, 0, &point).unwrap();

insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: 0.0, lat: 0.0 })
# Cells
# Belly Cells
");
"###);

db.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: 0.0, lat: 0.0 })
# Cells
Cell { res: 0, center: (2.3009, -5.2454) }: RoaringBitmap<[0]>
# Belly Cells
");
"###);

let point = GeoJson::from(geojson::Geometry::new(geojson::Value::Point(vec![
0.0, 1.0,
Expand All @@ -129,21 +129,21 @@ fn basic_write() {
])));
db.add(&mut wtxn, 2, &point).unwrap();

insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: 0.0, lat: 0.0 })
1: Point(Zoint { lng: 0.0, lat: 1.0 })
2: Point(Zoint { lng: 0.0, lat: 2.0 })
# Cells
Cell { res: 0, center: (2.3009, -5.2454) }: RoaringBitmap<[0]>
# Belly Cells
");
"###);

db.build(&mut wtxn, &|| false, &NoProgress).unwrap();

insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: 0.0, lat: 0.0 })
1: Point(Zoint { lng: 0.0, lat: 1.0 })
Expand All @@ -155,16 +155,16 @@ fn basic_write() {
Cell { res: 2, center: (-0.4597, 0.5342) }: RoaringBitmap<[0]>
# Belly Cells
Cell { res: 1, center: (2.0979, 0.4995) }: RoaringBitmap<[]>
");
"###);

let point = GeoJson::from(geojson::Geometry::new(geojson::Value::Point(vec![
0.0, 3.0,
])));
db.add(&mut wtxn, 3, &point).unwrap();
db.build(&mut wtxn, &|| false, &NoProgress).unwrap();

insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: 0.0, lat: 0.0 })
1: Point(Zoint { lng: 0.0, lat: 1.0 })
Expand All @@ -180,7 +180,7 @@ fn basic_write() {
Cell { res: 3, center: (2.9436, 0.1993) }: RoaringBitmap<[3]>
# Belly Cells
Cell { res: 2, center: (2.0979, 0.4995) }: RoaringBitmap<[]>
");
"###);
}

#[test]
Expand All @@ -200,8 +200,8 @@ fn bug_write_points_create_cells_too_deep() {
])));
db.add(&mut wtxn, 1, &point).unwrap();
db.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: -11.460678226504395, lat: 48.213563161838714 })
1: Point(Zoint { lng: -1.520397001416467, lat: 54.586501531522245 })
Expand All @@ -210,7 +210,7 @@ fn bug_write_points_create_cells_too_deep() {
Cell { res: 1, center: (45.2992, -14.2485) }: RoaringBitmap<[0]>
Cell { res: 1, center: (53.6528, 0.2143) }: RoaringBitmap<[1]>
# Belly Cells
");
"###);
}

#[test]
Expand All @@ -231,8 +231,8 @@ fn bug_write_points_create_unrelated_cells() {
])));
db.add(&mut wtxn, 1, &point).unwrap();
db.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: 6.0197316417968105, lat: 49.63676497357687 })
1: Point(Zoint { lng: 7.435508967561083, lat: 43.76438119061842 })
Expand All @@ -241,7 +241,7 @@ fn bug_write_points_create_unrelated_cells() {
Cell { res: 1, center: (47.9847, 6.9179) }: RoaringBitmap<[0]>
Cell { res: 1, center: (40.9713, 2.8207) }: RoaringBitmap<[1]>
# Belly Cells
");
"###);
}

#[test]
Expand Down Expand Up @@ -270,14 +270,14 @@ fn query_points_on_transmeridian_cell() {

db.add(&mut wtxn, 0, &lake).unwrap();
db.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: -172.36201, lat: 64.42921 })
# Cells
Cell { res: 0, center: (64.4181, -158.9175) }: RoaringBitmap<[0]>
# Belly Cells
");
"###);

let ret = db.in_shape(&wtxn, &contains_lake).unwrap();
insta::assert_debug_snapshot!(ret, @"RoaringBitmap<[0]>");
Expand All @@ -288,8 +288,8 @@ fn query_points_on_transmeridian_cell() {

db.add(&mut wtxn, 1, &airport).unwrap();
db.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Point(Zoint { lng: -172.36201, lat: 64.42921 })
1: Point(Zoint { lng: -173.23841, lat: 64.37949 })
Expand All @@ -300,7 +300,7 @@ fn query_points_on_transmeridian_cell() {
Cell { res: 2, center: (64.6946, -176.8313) }: RoaringBitmap<[1]>
# Belly Cells
Cell { res: 1, center: (67.6370, -175.8874) }: RoaringBitmap<[]>
");
"###);

let ret = db.in_shape(&wtxn, &contains_lake).unwrap();
insta::assert_debug_snapshot!(ret, @"RoaringBitmap<[0]>");
Expand Down Expand Up @@ -333,8 +333,8 @@ fn store_all_kind_of_collection() {
db.add(&mut wtxn, 2, &feature_collection.into()).unwrap();

db.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(db.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(db.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Collection(Zollection { bounding_box: BoundingBox { bottom_left: Coord { x: 6.0197316417968105, y: 49.63676497357687 }, top_right: Coord { x: 6.0197316417968105, y: 49.63676497357687 } }, points: ZultiPoints { bounding_box: BoundingBox { bottom_left: Coord { x: 6.0197316417968105, y: 49.63676497357687 }, top_right: Coord { x: 6.0197316417968105, y: 49.63676497357687 } }, points: [Zoint { lng: 6.0197316417968105, lat: 49.63676497357687 }] }, lines: ZultiLines { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zines: [] }, polygons: ZultiPolygons { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zolygons: [] } })
1: Collection(Zollection { bounding_box: BoundingBox { bottom_left: Coord { x: 6.0197316417968105, y: 49.63676497357687 }, top_right: Coord { x: 6.0197316417968105, y: 49.63676497357687 } }, points: ZultiPoints { bounding_box: BoundingBox { bottom_left: Coord { x: 6.0197316417968105, y: 49.63676497357687 }, top_right: Coord { x: 6.0197316417968105, y: 49.63676497357687 } }, points: [Zoint { lng: 6.0197316417968105, lat: 49.63676497357687 }] }, lines: ZultiLines { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zines: [] }, polygons: ZultiPolygons { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zolygons: [] } })
Expand Down Expand Up @@ -372,7 +372,7 @@ fn store_all_kind_of_collection() {
Cell { res: 13, center: (49.6368, 6.0197) }: RoaringBitmap<[]>
Cell { res: 14, center: (49.6368, 6.0197) }: RoaringBitmap<[]>
Cell { res: 15, center: (49.6368, 6.0197) }: RoaringBitmap<[]>
");
"###);
let contains =
polygon![(x: 6.0, y: 49.0), (x: 7.0, y: 49.0), (x: 7.0, y: 50.0), (x: 6.0, y: 50.0)];
let ret = db.in_shape(&wtxn, &contains).unwrap();
Expand Down Expand Up @@ -405,8 +405,8 @@ fn write_polygon_with_belly_cells_at_res0() {
cellulite.add(&mut wtxn, 1, &shape).unwrap();

cellulite.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(cellulite.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(cellulite.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Collection(Zollection { bounding_box: BoundingBox { bottom_left: Coord { x: -10.38791, y: 51.6838 }, top_right: Coord { x: -10.38791, y: 51.6838 } }, points: ZultiPoints { bounding_box: BoundingBox { bottom_left: Coord { x: -10.38791, y: 51.6838 }, top_right: Coord { x: -10.38791, y: 51.6838 } }, points: [Zoint { lng: -10.38791, lat: 51.6838 }] }, lines: ZultiLines { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zines: [] }, polygons: ZultiPolygons { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zolygons: [] } })
1: Polygon(Zolygon { bounding_box: BoundingBox { bottom_left: Coord { x: -36.80442428588867, y: 37.05668258666992 }, top_right: Coord { x: 12.589740753173828, y: 65.76936340332031 } }, coords: [Coord { x: -36.80442428588867, y: 59.85004425048828 }, Coord { x: -8.567954063415527, y: 65.76936340332031 }, Coord { x: 12.589740753173828, y: 56.09892654418945 }, Coord { x: 6.169264793395996, y: 41.49180603027344 }, Coord { x: -11.232604026794434, y: 37.05668258666992 }, Coord { x: -32.81175231933594, y: 44.35645294189453 }, Coord { x: -36.80442428588867, y: 59.85004425048828 }] })
Expand All @@ -420,7 +420,7 @@ fn write_polygon_with_belly_cells_at_res0() {
Cell { res: 0, center: (33.7110, -0.5345) }: RoaringBitmap<[1]>
# Belly Cells
Cell { res: 0, center: (52.6758, -11.6016) }: RoaringBitmap<[1]>
");
"###);

let filter = polygon![
(x: -13.35211181640625, y: 51.78105163574219),
Expand Down Expand Up @@ -454,8 +454,8 @@ fn write_polygon_with_belly_cells_at_res1() {
cellulite.add(&mut wtxn, 1, &shape).unwrap();

cellulite.build(&mut wtxn, &|| false, &NoProgress).unwrap();
insta::assert_snapshot!(cellulite.snap(&wtxn), @r"
# Version: 0.3.0
insta::assert_snapshot!(cellulite.snap(&wtxn), @r###"
# Version: 0.3.1
# Items
0: Collection(Zollection { bounding_box: BoundingBox { bottom_left: Coord { x: -10.89288, y: 52.91525 }, top_right: Coord { x: -10.89288, y: 52.91525 } }, points: ZultiPoints { bounding_box: BoundingBox { bottom_left: Coord { x: -10.89288, y: 52.91525 }, top_right: Coord { x: -10.89288, y: 52.91525 } }, points: [Zoint { lng: -10.89288, lat: 52.91525 }] }, lines: ZultiLines { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zines: [] }, polygons: ZultiPolygons { bounding_box: BoundingBox { bottom_left: Coord { x: 0.0, y: 0.0 }, top_right: Coord { x: 0.0, y: 0.0 } }, zolygons: [] } })
1: Polygon(Zolygon { bounding_box: BoundingBox { bottom_left: Coord { x: -22.350751876831055, y: 46.764404296875 }, top_right: Coord { x: -1.9412200450897217, y: 57.86238098144531 } }, coords: [Coord { x: -22.350751876831055, y: 54.04570388793945 }, Coord { x: -14.230262756347656, y: 57.86238098144531 }, Coord { x: -3.6089367866516113, y: 56.31303405761719 }, Coord { x: -1.9412200450897217, y: 50.917137145996094 }, Coord { x: -7.79402494430542, y: 46.764404296875 }, Coord { x: -18.57700538635254, y: 48.349578857421875 }, Coord { x: -22.350751876831055, y: 54.04570388793945 }] })
Expand All @@ -470,7 +470,7 @@ fn write_polygon_with_belly_cells_at_res1() {
Cell { res: 1, center: (57.6409, -21.6939) }: RoaringBitmap<[1]>
# Belly Cells
Cell { res: 1, center: (52.6758, -11.6016) }: RoaringBitmap<[1]>
");
"###);

let filter = polygon![
(x: -14.853970527648926, y: 52.716609954833984),
Expand Down