Skip to content

[Enhancement] Support some spatial functions #48695

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
HappenLee merged 14 commits into from
Apr 7, 2025
Merged

[Enhancement] Support some spatial functions #48695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
78ad92b
[feat][test](nereids)(vec) support the ST_Intersects, ST_Disjoint, ST…
koi2000 Mar 5, 2025
5579716
[Fix] Fix linestring vs linestring and linestring vs polygon bug in S…
koi2000 Mar 5, 2025
20e3680
Merge branch 'master' into master
koi2000 Mar 5, 2025
9f0cabd
[feat] refactor geo relationship functions using template to remove c…
koi2000 Mar 10, 2025
a7cd68a
Merge branch 'master' of https://github.com/koi2000/doris
koi2000 Mar 10, 2025
1cbab4e
[chore](geo) remove unused comment
koi2000 Mar 13, 2025
24a416f
[fix][test](geo) fix the bug of insufficient query precision in negat…
koi2000 Mar 26, 2025
701a7b1
[chore](geo) using assert_cast to replace the C-style cast
koi2000 Mar 27, 2025
25aee35
[chore][fix](geo) fix the bug that intersects and touches in circle a…
koi2000 Mar 27, 2025
92cdacf
[fix][test](geo) fix line bugs in intersects and touches and add regr…
koi2000 Mar 27, 2025
e2d26ae
[test](geo) add some new corner cases for intesects and touches in re…
koi2000 Mar 27, 2025
c958fe0
Merge branch 'master' of https://github.com/apache/doris
koi2000 Apr 3, 2025
0799c29
Merge branch 'master' into master
koi2000 Apr 3, 2025
3458d9a
[fix](geo) fix the bug that shape may be a null pointer in StRelation…
koi2000 Apr 4, 2025
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
600 changes: 600 additions & 0 deletions be/src/geo/geo_types.cpp
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions be/src/geo/geo_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ class GeoShape {
virtual std::string as_wkt() const = 0;

virtual bool contains(const GeoShape* rhs) const { return false; }

virtual bool disjoint(const GeoShape* rhs) const { return false; }

virtual bool intersects(const GeoShape* rhs) const { return false; }

virtual bool touches(const GeoShape* rhs) const { return false; }

virtual std::string to_string() const { return ""; }
static std::string as_binary(GeoShape* rhs);

Expand All @@ -82,6 +89,10 @@ class GeoPoint : public GeoShape {

GeoCoordinateList to_coords() const;

bool intersects(const GeoShape* rhs) const override;
bool disjoint(const GeoShape* rhs) const override;
bool touches(const GeoShape* rhs) const override;

GeoShapeType type() const override { return GEO_SHAPE_POINT; }

const S2Point* point() const { return _point.get(); }
Expand Down Expand Up @@ -119,6 +130,10 @@ class GeoLine : public GeoShape {

GeoCoordinateList to_coords() const;

bool intersects(const GeoShape* rhs) const override;
bool disjoint(const GeoShape* rhs) const override;
bool touches(const GeoShape* rhs) const override;

GeoShapeType type() const override { return GEO_SHAPE_LINE_STRING; }
const S2Polyline* polyline() const { return _polyline.get(); }

Expand Down Expand Up @@ -148,7 +163,14 @@ class GeoPolygon : public GeoShape {
GeoShapeType type() const override { return GEO_SHAPE_POLYGON; }
const S2Polygon* polygon() const { return _polygon.get(); }

bool intersects(const GeoShape* rhs) const override;
bool disjoint(const GeoShape* rhs) const override;
bool touches(const GeoShape* rhs) const override;
bool contains(const GeoShape* rhs) const override;

bool polygon_touch_point(const S2Polygon* polygon, const S2Point* point) const;
bool polygon_touch_polygon(const S2Polygon* polygon1, const S2Polygon* polygon2) const;

std::string as_wkt() const override;

int numLoops() const;
Expand All @@ -174,6 +196,11 @@ class GeoCircle : public GeoShape {

GeoShapeType type() const override { return GEO_SHAPE_CIRCLE; }

const S2Cap* circle() const { return _cap.get(); }

bool intersects(const GeoShape* rhs) const override;
bool disjoint(const GeoShape* rhs) const override;
bool touches(const GeoShape* rhs) const override;
bool contains(const GeoShape* rhs) const override;
std::string as_wkt() const override;

Expand Down
69 changes: 44 additions & 25 deletions be/src/vec/functions/functions_geo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,11 +626,13 @@ struct StCircle {
}
};

struct StContains {
template <typename Func>
struct StRelationFunction {
static constexpr auto NEED_CONTEXT = true;
static constexpr auto NAME = "st_contains";
static constexpr auto NAME = Func::NAME;
static const size_t NUM_ARGS = 2;
using Type = DataTypeUInt8;

static Status execute(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result) {
DCHECK_EQ(arguments.size(), 2);
Expand All @@ -642,8 +644,7 @@ struct StContains {

const auto size = std::max(left_column->size(), right_column->size());

auto res = ColumnUInt8::create();
res->reserve(size);
auto res = ColumnUInt8::create(size, 0);
auto null_map = ColumnUInt8::create(size, 0);
auto& null_map_data = null_map->get_data();

Expand All @@ -660,55 +661,50 @@ struct StContains {
}

static void loop_do(StringRef& lhs_value, StringRef& rhs_value,
std::vector<std::shared_ptr<GeoShape>>& shapes, int& i,
std::vector<std::unique_ptr<GeoShape>>& shapes,
ColumnUInt8::MutablePtr& res, NullMap& null_map, int row) {
StringRef* strs[2] = {&lhs_value, &rhs_value};
for (i = 0; i < 2; ++i) {
shapes[i] =
std::shared_ptr<GeoShape>(GeoShape::from_encoded(strs[i]->data, strs[i]->size));
if (shapes[i] == nullptr) {
for (int i = 0; i < 2; ++i) {
std::unique_ptr<GeoShape> shape(GeoShape::from_encoded(strs[i]->data, strs[i]->size));
shapes[i] = std::move(shape);
if (!shapes[i]) {
null_map[row] = 1;
res->insert_default();
break;
Copy link
Contributor

@HappenLee HappenLee Mar 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here better directly return, not need check if (i == 2)

Copy link
Contributor Author

@koi2000 koi2000 Mar 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Copy link
Contributor Author

@koi2000 koi2000 Apr 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I didn't understand the purpose of checking if i is equal to 2. Checking if i is 2 is actually checking for the presence of a nullptr, I've fixed it now.

}
}

if (i == 2) {
auto contains_value = shapes[0]->contains(shapes[1].get());
res->insert_data(const_cast<const char*>((char*)&contains_value), 0);
if (shapes[0] && shapes[1]) {
auto relation_value = Func::evaluate(shapes[0].get(), shapes[1].get());
res->get_data()[row] = relation_value;
}
}

static void const_vector(const ColumnPtr& left_column, const ColumnPtr& right_column,
ColumnUInt8::MutablePtr& res, NullMap& null_map, const size_t size) {
int i;
auto lhs_value = left_column->get_data_at(0);
std::vector<std::shared_ptr<GeoShape>> shapes = {nullptr, nullptr};
std::vector<std::unique_ptr<GeoShape>> shapes(2);
for (int row = 0; row < size; ++row) {
auto rhs_value = right_column->get_data_at(row);
loop_do(lhs_value, rhs_value, shapes, i, res, null_map, row);
loop_do(lhs_value, rhs_value, shapes, res, null_map, row);
}
}

static void vector_const(const ColumnPtr& left_column, const ColumnPtr& right_column,
ColumnUInt8::MutablePtr& res, NullMap& null_map, const size_t size) {
int i;
auto rhs_value = right_column->get_data_at(0);
std::vector<std::shared_ptr<GeoShape>> shapes = {nullptr, nullptr};
std::vector<std::unique_ptr<GeoShape>> shapes(2);
for (int row = 0; row < size; ++row) {
auto lhs_value = left_column->get_data_at(row);
loop_do(lhs_value, rhs_value, shapes, i, res, null_map, row);
loop_do(lhs_value, rhs_value, shapes, res, null_map, row);
}
}

static void vector_vector(const ColumnPtr& left_column, const ColumnPtr& right_column,
ColumnUInt8::MutablePtr& res, NullMap& null_map, const size_t size) {
int i;
std::vector<std::shared_ptr<GeoShape>> shapes = {nullptr, nullptr};
std::vector<std::unique_ptr<GeoShape>> shapes(2);
for (int row = 0; row < size; ++row) {
auto lhs_value = left_column->get_data_at(row);
auto rhs_value = right_column->get_data_at(row);
loop_do(lhs_value, rhs_value, shapes, i, res, null_map, row);
loop_do(lhs_value, rhs_value, shapes, res, null_map, row);
}
}

Expand All @@ -719,7 +715,27 @@ struct StContains {
static Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}
}; // namespace doris::vectorized
};

struct StContainsFunc {
static constexpr auto NAME = "st_contains";
static bool evaluate(GeoShape* shape1, GeoShape* shape2) { return shape1->contains(shape2); }
};

struct StIntersectsFunc {
static constexpr auto NAME = "st_intersects";
static bool evaluate(GeoShape* shape1, GeoShape* shape2) { return shape1->intersects(shape2); }
};

struct StDisjointFunc {
static constexpr auto NAME = "st_disjoint";
static bool evaluate(GeoShape* shape1, GeoShape* shape2) { return shape1->disjoint(shape2); }
};

struct StTouchesFunc {
static constexpr auto NAME = "st_touches";
static bool evaluate(GeoShape* shape1, GeoShape* shape2) { return shape1->touches(shape2); }
};

struct StGeometryFromText {
static constexpr auto NAME = "st_geometryfromtext";
Expand Down Expand Up @@ -914,7 +930,10 @@ void register_function_geo(SimpleFunctionFactory& factory) {
factory.register_function<GeoFunction<StAngleSphere>>();
factory.register_function<GeoFunction<StAngle>>();
factory.register_function<GeoFunction<StAzimuth>>();
factory.register_function<GeoFunction<StContains>>();
factory.register_function<GeoFunction<StRelationFunction<StContainsFunc>>>();
factory.register_function<GeoFunction<StRelationFunction<StIntersectsFunc>>>();
factory.register_function<GeoFunction<StRelationFunction<StDisjointFunc>>>();
factory.register_function<GeoFunction<StRelationFunction<StTouchesFunc>>>();
factory.register_function<GeoFunction<StCircle>>();
factory.register_function<GeoFunction<StGeoFromText<StGeometryFromText>>>();
factory.register_function<GeoFunction<StGeoFromText<StGeomFromText>>>();
Expand Down
Loading
Loading