Skip to content

fix(rust/sedona-functions): Let ST_Collect_Agg() on a Geography return a Geography #467

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

Merged
paleolimbot merged 4 commits into from
Jan 5, 2026
Merged

fix(rust/sedona-functions): Let ST_Collect_Agg() on a Geography return a Geography #467

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ead30e0
Let ST_Collect_Agg() on a Geography return a Geography
yutannihilation Dec 21, 2025
83eb905
Address clippy lint error
yutannihilation Dec 21, 2025
101b58d
Merge remote-tracking branch 'upstream/main' into fix/st_collect_agg-…
yutannihilation Jan 4, 2026
0a02022
Address comment
yutannihilation Jan 4, 2026
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
27 changes: 22 additions & 5 deletions rust/sedona-functions/src/st_collect_agg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use sedona_geometry::{
},
};
use sedona_schema::{
datatypes::{SedonaType, WKB_GEOMETRY},
datatypes::{SedonaType, WKB_GEOGRAPHY, WKB_GEOMETRY},
matchers::ArgMatcher,
};

Expand All @@ -48,7 +48,12 @@ use sedona_schema::{
pub fn st_collect_agg_udf() -> SedonaAggregateUDF {
SedonaAggregateUDF::new(
"st_collect_agg",
vec![Arc::new(STCollectAggr {})],
vec![
Arc::new(STCollectAggr {
is_geography: false,
}),
Arc::new(STCollectAggr { is_geography: true }),
],
Volatility::Immutable,
Some(st_collect_agg_doc()),
)
Expand All @@ -66,11 +71,16 @@ fn st_collect_agg_doc() -> Documentation {
}

#[derive(Debug)]
struct STCollectAggr {}
struct STCollectAggr {
is_geography: bool,
}

impl SedonaAccumulator for STCollectAggr {
fn return_type(&self, args: &[SedonaType]) -> Result<Option<SedonaType>> {
let matcher = ArgMatcher::new(vec![ArgMatcher::is_geometry_or_geography()], WKB_GEOMETRY);
let matcher = match self.is_geography {
true => ArgMatcher::new(vec![ArgMatcher::is_geography()], WKB_GEOGRAPHY),
false => ArgMatcher::new(vec![ArgMatcher::is_geometry()], WKB_GEOMETRY),
};
matcher.match_args(args)
}

Expand Down Expand Up @@ -299,7 +309,7 @@ impl Accumulator for CollectionAccumulator {
mod test {
use datafusion_expr::AggregateUDF;
use rstest::rstest;
use sedona_schema::datatypes::WKB_VIEW_GEOMETRY;
use sedona_schema::datatypes::{WKB_VIEW_GEOGRAPHY, WKB_VIEW_GEOMETRY};
use sedona_testing::{compare::assert_scalar_equal_wkb_geometry, testers::AggregateUdfTester};

use super::*;
Expand Down Expand Up @@ -371,4 +381,11 @@ mod test {
"Can't ST_Collect_Agg() mixed dimension geometries"
);
}

#[rstest]
fn udf_geog(#[values(WKB_GEOGRAPHY, WKB_VIEW_GEOGRAPHY)] sedona_type: SedonaType) {
let tester =
AggregateUdfTester::new(st_collect_agg_udf().into(), vec![sedona_type.clone()]);
assert_eq!(tester.return_type().unwrap(), WKB_GEOGRAPHY);
}
}