thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed file

Browse Source
This commit is contained in:
Alexey Milovidov 2020-03-25 21:54:45 +03:00
parent 3e8aec99f5
commit c8108dc438
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Functions/PolygonUtils.h
View File

@ -38,14 +38,10 @@ namespace DB
namespace ErrorCodes
{
extern const int LOGICAL_ERROR;
extern const int LOGICAL_ERROR;
}
namespace GeoUtils
{
template <typename Polygon>
UInt64 getPolygonAllocatedBytes(const Polygon & polygon)
{
@ -659,5 +655,3 @@ std::string serialize(Polygon && polygon)
}
}
}

8
dbms/src/Functions/pointInPolygon.cpp
View File

@ -64,17 +64,17 @@ ColumnPtr callPointInPolygonImplWithPool(const IColumn & x, const IColumn & y, P
return ptr.release();
};
std::string serialized_polygon = GeoUtils::serialize(polygon);
std::string serialized_polygon = serialize(polygon);
auto impl = known_polygons.get(serialized_polygon, factory);
return GeoUtils::pointInPolygon(x, y, *impl);
return pointInPolygon(x, y, *impl);
}
template <typename Polygon, typename PointInPolygonImpl>
ColumnPtr callPointInPolygonImpl(const IColumn & x, const IColumn & y, Polygon & polygon)
{
PointInPolygonImpl impl(polygon);
return GeoUtils::pointInPolygon(x, y, impl);
return pointInPolygon(x, y, impl);
}
}
@ -234,7 +234,7 @@ private:
void registerFunctionPointInPolygon(FunctionFactory & factory)
{
factory.registerFunction<FunctionPointInPolygon<GeoUtils::PointInPolygonWithGrid<Float64>, true>>();
factory.registerFunction<FunctionPointInPolygon<PointInPolygonWithGrid<Float64>, true>>();
}
}