thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-27 20:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix style errors

Browse Source
This commit is contained in:
achulkov2 2020-02-21 17:50:28 +03:00
parent c77ca489cc
commit df8abab8d0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Dictionaries/PolygonDictionaryImplementations.cpp
View File

@ -66,7 +66,8 @@ GridPolygonDictionary::GridPolygonDictionary(
{
std::vector<size_t> order(polygons.size());
std::iota(order.begin(), order.end(), 0);
std::sort(order.begin(), order.end(), [&](auto lhs, auto rhs) {
std::sort(order.begin(), order.end(), [&](auto lhs, auto rhs)
{
return areas[lhs] < areas[rhs];
});
grid.init(order);

9
dbms/src/Dictionaries/PolygonDictionaryUtils.cpp
View File

@ -44,7 +44,8 @@ const FinalCell * GridRoot::find(Float64 x, Float64 y) const
std::unique_ptr<ICell> GridRoot::makeCell(Float64 current_min_x, Float64 current_min_y, Float64 current_max_x, Float64 current_max_y, std::vector<size_t> possible_ids, size_t depth)
{
auto current_box = Box(Point(current_min_x, current_min_y), Point(current_max_x, current_max_y));
possible_ids.erase(std::remove_if(possible_ids.begin(), possible_ids.end(), [&](const auto & id) {
possible_ids.erase(std::remove_if(possible_ids.begin(), possible_ids.end(), [&](const auto & id)
{
return !bg::intersects(current_box, polygons[id]);
}), possible_ids.end());
if (possible_ids.size() <= kMinIntersections || depth++ == kMaxDepth)
@ -68,8 +69,10 @@ std::unique_ptr<ICell> GridRoot::makeCell(Float64 current_min_x, Float64 current
void GridRoot::setBoundingBox()
{
bool first = true;
std::for_each(polygons.begin(), polygons.end(), [&](const auto & polygon) {
bg::for_each_point(polygon, [&](const Point & point) {
std::for_each(polygons.begin(), polygons.end(), [&](const auto & polygon)
{
bg::for_each_point(polygon, [&](const Point & point)
{
auto x = point.get<0>();
auto y = point.get<1>();
if (first || x < min_x)