-
Notifications
You must be signed in to change notification settings - Fork 42
feat(rust/sedona-spatial-join): Support partitioned KNN join to handle larger than memory object side #573
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.
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
Open
Kontinuation
wants to merge
3
commits into
apache:main
Choose a base branch
from
Kontinuation:pr-partitioned-knnj
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // 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. | ||
|
|
||
| use datafusion_common::Result; | ||
| use sedona_common::sedona_internal_err; | ||
| use sedona_geometry::bounding_box::BoundingBox; | ||
|
|
||
| use crate::partitioning::{SpatialPartition, SpatialPartitioner}; | ||
|
|
||
| /// A partitioner that assigns everything to the Multi partition. | ||
| /// | ||
| /// This partitioner is useful when we want to broadcast the data to all partitions. | ||
| pub struct BroadcastPartitioner { | ||
| num_partitions: usize, | ||
| } | ||
|
|
||
| impl BroadcastPartitioner { | ||
| pub fn new(num_partitions: usize) -> Self { | ||
| Self { num_partitions } | ||
| } | ||
| } | ||
|
|
||
| impl SpatialPartitioner for BroadcastPartitioner { | ||
| fn num_regular_partitions(&self) -> usize { | ||
| self.num_partitions | ||
| } | ||
|
|
||
| fn partition(&self, _bbox: &BoundingBox) -> Result<SpatialPartition> { | ||
| Ok(SpatialPartition::Multi) | ||
| } | ||
|
|
||
| fn partition_no_multi(&self, _bbox: &BoundingBox) -> Result<SpatialPartition> { | ||
| sedona_internal_err!("BroadcastPartitioner does not support partition_no_multi") | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_broadcast_partitioner() { | ||
| let num_partitions = 4; | ||
| let partitioner = BroadcastPartitioner::new(num_partitions); | ||
| assert_eq!(partitioner.num_regular_partitions(), num_partitions); | ||
|
|
||
| let bbox = BoundingBox::xy((0.0, 10.0), (0.0, 10.0)); | ||
|
|
||
| // Test partition | ||
| assert_eq!( | ||
| partitioner.partition(&bbox).unwrap(), | ||
| SpatialPartition::Multi | ||
| ); | ||
|
|
||
| // Test partition_no_multi | ||
| assert!(partitioner.partition_no_multi(&bbox).is_err()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // 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. | ||
|
|
||
| use std::sync::atomic::{AtomicUsize, Ordering}; | ||
|
|
||
| use datafusion_common::Result; | ||
| use sedona_geometry::bounding_box::BoundingBox; | ||
|
|
||
| use crate::partitioning::{SpatialPartition, SpatialPartitioner}; | ||
|
|
||
| /// A partitioner that assigns partitions in a round-robin fashion. | ||
| /// | ||
| /// This partitioner is used for KNN join, where the build side is partitioned | ||
| /// into `num_partitions` partitions, and the probe side is assigned to the | ||
| /// `Multi` partition (i.e., broadcast to all partitions). | ||
| pub struct RoundRobinPartitioner { | ||
| num_partitions: usize, | ||
| counter: AtomicUsize, | ||
| } | ||
|
|
||
| impl RoundRobinPartitioner { | ||
| pub fn new(num_partitions: usize) -> Self { | ||
| Self { | ||
| num_partitions, | ||
| counter: AtomicUsize::new(0), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl SpatialPartitioner for RoundRobinPartitioner { | ||
| fn num_regular_partitions(&self) -> usize { | ||
| self.num_partitions | ||
| } | ||
|
|
||
| fn partition(&self, bbox: &BoundingBox) -> Result<SpatialPartition> { | ||
| self.partition_no_multi(bbox) | ||
| } | ||
|
|
||
| fn partition_no_multi(&self, _bbox: &BoundingBox) -> Result<SpatialPartition> { | ||
| let idx = self.counter.fetch_add(1, Ordering::Relaxed); | ||
| Ok(SpatialPartition::Regular( | ||
| (idx % self.num_partitions) as u32, | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_round_robin_partitioner() { | ||
| let num_partitions = 4; | ||
| let partitioner = RoundRobinPartitioner::new(num_partitions); | ||
| assert_eq!(partitioner.num_regular_partitions(), num_partitions); | ||
|
|
||
| let bbox = BoundingBox::xy((0.0, 10.0), (0.0, 10.0)); | ||
|
|
||
| for i in 0..10 { | ||
| assert_eq!( | ||
| partitioner.partition_no_multi(&bbox).unwrap(), | ||
| SpatialPartition::Regular((i % num_partitions) as u32) | ||
| ); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This round robin partitioner is nondeterministic due to the order of concurrent tasks being scheduled. We will address this by making all partitioners non-sync, so that each async task will have its own partitioner with its own mutable internal state. This will be a relatively large refactoring so I'll leave it to the next PR.