Skip to content
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

Fix NPE for spatial left join #18866

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Fix NPE for spatial left join #18866

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 core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public int[] findJoinPositions(int probePosition, Page probe, int probeGeometryC
}
});

return matchingPositions.toIntArray(null);
return matchingPositions.toIntArray();
}

private boolean testReferencePoint(Envelope probeEnvelope, OGCGeometry buildGeometry, int partition)
Expand Down
19 changes: 19 additions & 0 deletions plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestSpatialJoins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.trino.plugin.hive.metastore.Database;
import io.trino.plugin.hive.metastore.HiveMetastore;
import io.trino.spi.security.PrincipalType;
import io.trino.sql.query.QueryAssertions;
import io.trino.testing.AbstractTestQueryFramework;
import io.trino.testing.DistributedQueryRunner;
import org.testng.annotations.Test;
Expand All @@ -29,6 +30,7 @@
import static io.trino.plugin.hive.metastore.file.TestingFileHiveMetastore.createTestingFileHiveMetastore;
import static io.trino.testing.TestingSession.testSessionBuilder;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;

public class TestSpatialJoins
extends AbstractTestQueryFramework
Expand Down Expand Up @@ -399,4 +401,21 @@ public void testSpatialJoinOverFullJoinWithOrPredicate()
"ON ST_Contains(ST_GeometryFromText(b.wkt), ST_Point(a.latitude1, a.longitude1)) OR ST_Contains(ST_GeometryFromText(b.wkt), ST_Point(a.latitude2, a.longitude2))",
"VALUES ('x', 'a'), ('y', 'b'), ('y', 'c'), (NULL, 'd'), (NULL, 'empty'), ('z', NULL), (NULL, 'null'), ('null', NULL)");
}

@Test
public void testLeftJoin()
{
assertThat(new QueryAssertions(getQueryRunner()).query("""
WITH
points(lat, lon) AS ( VALUES (0.5, 0.5), (2, 2) ),
polygons(id, x) AS ( VALUES (1, ST_GeometryFromText('POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))')) )
SELECT id, lat, lon
FROM points LEFT JOIN polygons ON st_contains(x, ST_Point(lat, lon))
"""))
.matches("""
VALUES
(1, 0.5, 0.5),
(NULL, 2, 2)
""");
}
}