Skip to content

[GH-3089] Fix empty-envelope false candidate and RS_DWithin EXPLAIN label in raster distance join #3090

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
jiayuasu merged 1 commit into from
Jul 2, 2026
+7 −1
Merged

[GH-3089] Fix empty-envelope false candidate and RS_DWithin EXPLAIN label in raster distance join #3090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...src/main/scala/org/apache/spark/sql/sedona_sql/strategy/join/BroadcastIndexJoinExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ case class BroadcastIndexJoinExec(
case (None, _, false) => s"ST_$spatialPredicate($windowExpression, $objectExpression)"
case (None, _, true) => s"RS_$spatialPredicate($windowExpression, $objectExpression)"
case (Some(r), _, true) =>
s"RS_Distance($windowExpression, $objectExpression) < $r"
s"RS_DWithin($windowExpression, $objectExpression, $r)"
}

override def simpleString(maxFields: Int): String =
Expand Down
6 changes: 6 additions & 0 deletions ...mon/src/main/scala/org/apache/spark/sql/sedona_sql/strategy/join/TraitJoinQueryBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,12 @@ trait TraitJoinQueryBase {
private[join] def expandRasterFilterEnvelope(
baseShape: Geometry,
distance: Double): Geometry = {
// An empty shape (e.g. the empty GeometryCollection substituted for a NULL raster/geometry)
// must stay empty: expanding its degenerate envelope by `distance` would yield a non-empty
// filter geometry that spuriously matches rows the predicate should never join.
if (baseShape.isEmpty) {
return baseShape
}
Comment thread
jiayuasu marked this conversation as resolved.
val envelope = baseShape.getEnvelopeInternal
val touchesPole = envelope.getMaxY >= 90.0 || envelope.getMinY <= -90.0
val tooWide = envelope.getWidth > 180.0
Expand Down
Loading