Kontinuation commented on code in PR #443: URL: https://github.com/apache/sedona-db/pull/443#discussion_r2618279317
########## rust/sedona-spatial-join/src/partitioning/flat.rs: ########## @@ -0,0 +1,177 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +//! Flat (linear scan) spatial partitioner. +//! +//! This module provides a minimal partitioner that shares the same +//! intersection semantics as [`crate::partitioning::rtree::RTreePartitioner`] +//! but avoids the RTree indexing overhead. It stores partition boundaries +//! in a flat array and performs a linear scan to classify each query +//! bounding box. +//! +//! The partitioner follows the standard spatial partition semantics: +//! - Returns [`SpatialPartition::Regular`] when exactly one boundary +//! intersects the query bbox. +//! - Returns [`SpatialPartition::Multi`] when multiple boundaries +//! intersect the query bbox. +//! - Returns [`SpatialPartition::None`] when no boundary intersects +//! the query bbox. + +use datafusion_common::Result; +use geo::Rect; +use sedona_geometry::bounding_box::BoundingBox; + +use crate::partitioning::util::{bbox_to_geo_rect, rect_intersection_area, rects_intersect}; +use crate::partitioning::{SpatialPartition, SpatialPartitioner}; + +/// Spatial partitioner that linearly scans partition boundaries. +pub struct FlatPartitioner { + boundaries: Vec<Rect<f32>>, + num_partitions: usize, +} + +impl FlatPartitioner { + /// Create a new flat partitioner from explicit partition boundaries. + pub fn new(boundaries: Vec<BoundingBox>) -> Result<Self> { + let mut rects = Vec::with_capacity(boundaries.len()); + for bbox in boundaries { + rects.push(bbox_to_geo_rect(&bbox)?); + } + + let num_partitions = rects.len(); + + Ok(Self { + boundaries: rects, + num_partitions, + }) + } +} + +impl SpatialPartitioner for FlatPartitioner { + fn num_regular_partitions(&self) -> usize { + self.num_partitions + } + + fn partition(&self, bbox: &BoundingBox) -> Result<SpatialPartition> { + let query_rect = bbox_to_geo_rect(bbox)?; + let mut first_match = None; + for (idx, boundary) in self.boundaries.iter().enumerate() { + if rects_intersect(boundary, &query_rect) { + if first_match.is_some() { + return Ok(SpatialPartition::Multi); + } + first_match = Some(idx as u32); + } + } + + Ok(match first_match { + Some(id) => SpatialPartition::Regular(id), + None => SpatialPartition::None, + }) + } + + fn partition_no_multi(&self, bbox: &BoundingBox) -> Result<SpatialPartition> { + let query_rect = bbox_to_geo_rect(bbox)?; + let mut best_partition = None; + let mut best_area = -1.0_f32; + + for (idx, boundary) in self.boundaries.iter().enumerate() { + if rects_intersect(boundary, &query_rect) { + let area = rect_intersection_area(boundary, &query_rect); + if area > best_area { + best_area = area; + best_partition = Some(idx as u32); + } + } + } + + Ok(match best_partition { + Some(id) => SpatialPartition::Regular(id), + None => SpatialPartition::None, + }) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn sample_partitions() -> Vec<BoundingBox> { + vec![ + BoundingBox::xy((0.0, 50.0), (0.0, 50.0)), + BoundingBox::xy((50.0, 100.0), (0.0, 50.0)), + BoundingBox::xy((0.0, 50.0), (50.0, 100.0)), + BoundingBox::xy((50.0, 100.0), (50.0, 100.0)), + ] + } + + #[test] + fn test_flat_partitioner_creation() { + let partitioner = FlatPartitioner::new(sample_partitions()).unwrap(); + assert_eq!(partitioner.num_regular_partitions(), 4); + } + + #[test] + fn test_flat_partitioner_regular() { + let partitioner = FlatPartitioner::new(sample_partitions()).unwrap(); + let bbox = BoundingBox::xy((10.0, 20.0), (10.0, 20.0)); + match partitioner.partition(&bbox).unwrap() { + SpatialPartition::Regular(id) => assert_eq!(id, 0), + _ => panic!("expected Regular partition"), + } Review Comment: I have removed all panics in the test and assert the resulting spatial partitions in a better way. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
