Skip to content

fix: Use envelope serde in ST_Envelope #15349

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

Closed
wants to merge 1 commit into from
Closed

fix: Use envelope serde in ST_Envelope #15349

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
18 changes: 3 additions & 15 deletions velox/functions/prestosql/GeometryFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,22 +1249,10 @@ struct StEnvelopeFunction {

FOLLY_ALWAYS_INLINE Status
call(out_type<Geometry>& result, const arg_type<Geometry>& geometry) {
std::unique_ptr<const geos::geom::Geometry> geosGeometry =
geospatial::GeometryDeserializer::deserialize(geometry);

auto env = geosGeometry->getEnvelope();

if (env->isEmpty()) {
GEOS_TRY(
{
auto polygon =
std::unique_ptr<geos::geom::Polygon>(factory_->createPolygon());
geospatial::GeometrySerializer::serialize(*polygon, result);
},
"Failed to create empty polygon in ST_Envelope");
}
std::unique_ptr<geos::geom::Envelope> env =
geospatial::GeometryDeserializer::deserializeEnvelope(geometry);

geospatial::GeometrySerializer::serialize(*env, result);
geospatial::GeometrySerializer::serializeEnvelope(*env, result);

return Status::OK();
}
Expand Down
14 changes: 12 additions & 2 deletions velox/functions/prestosql/tests/GeometryFunctionsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ TEST_F(GeometryFunctionsTest, testStEnvelope) {
[&](const std::optional<std::string>& wkt,
const std::optional<std::string>& expected) {
std::optional<std::string> result = evaluateOnce<std::string>(
"ST_AsText(ST_Envelope(ST_GeometryFromText(c0)))", wkt);
"ST_AsText(st_envelope(ST_GeometryFromText(c0)))", wkt);

if (expected.has_value()) {
ASSERT_TRUE(result.has_value());
Expand All @@ -2314,7 +2314,6 @@ TEST_F(GeometryFunctionsTest, testStEnvelope) {

testStEnvelopeFunc(
"MULTIPOINT (1 2, 2 4, 3 6, 4 8)", "POLYGON ((1 2, 1 8, 4 8, 4 2, 1 2))");
testStEnvelopeFunc("LINESTRING EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc(
"LINESTRING (1 1, 2 2, 1 3)", "POLYGON ((1 1, 1 3, 2 3, 2 1, 1 1))");
testStEnvelopeFunc(
Expand All @@ -2330,6 +2329,17 @@ TEST_F(GeometryFunctionsTest, testStEnvelope) {
testStEnvelopeFunc(
"GEOMETRYCOLLECTION (POINT (5 1), LINESTRING (3 4, 4 4))",
"POLYGON ((3 1, 3 4, 5 4, 5 1, 3 1))");
testStEnvelopeFunc(
"MULTIPOLYGON (((119.094024 -27.2871725, 119.094024 -27.2846569, 119.094024 -27.2868119, 119.094024 -27.2871725)))",
"POLYGON ((119.094024 -27.2871725, 119.094024 -27.2846569, 119.094024 -27.2846569, 119.094024 -27.2871725, 119.094024 -27.2871725))");

testStEnvelopeFunc("POLYGON EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc("MULTIPOLYGON EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc("GEOMETRYCOLLECTION EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc("POINT EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc("MULTIPOINT EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc("LINESTRING EMPTY", "POLYGON EMPTY");
testStEnvelopeFunc("MULTILINESTRING EMPTY", "POLYGON EMPTY");
}

TEST_F(GeometryFunctionsTest, testStPoints) {
Expand Down
Loading