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

Merge remote-tracking branch 'origin/polygon-dicts-opts' into polygon-dict-grids

Browse Source
This commit is contained in:
Anton Kvasha 2020-05-06 20:32:14 +03:00
commit 068633fc3e
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/base64 vendored

@ -1 +1 @@
Subproject commit 5257626d2be17a3eb23f79be17fe55ebba394ad2 Subproject commit 95ba56a9b041f9933f5cd2bbb2ee4e083468c20a

2
contrib/poco vendored

@ -1 +1 @@
Subproject commit 1f3e4638f250ad4d028a2499af20d4185463e07d Subproject commit 860574c93980d887a89df141edd9ca2fb0024fa3

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

@ -326,6 +326,18 @@ bool BucketsPolygonIndex::Edge::compare2(const Edge & a, const Edge & b)
return a.polygon_id < b.polygon_id; return a.polygon_id < b.polygon_id;
} }
namespace
{
inline void update_result(bool & found, size_t & id, const size_t & new_id)
{
if (!found || new_id < id)
{
found = true;
id = new_id;
}
}
}
bool BucketsPolygonIndex::find(const Point & point, size_t & id) const bool BucketsPolygonIndex::find(const Point & point, size_t & id) const
{ {
/** TODO: maybe we should check for vertical line? */ /** TODO: maybe we should check for vertical line? */
@ -342,13 +354,15 @@ bool BucketsPolygonIndex::find(const Point & point, size_t & id) const
return false; return false;
} }
bool found = false;
/** point is considired inside when ray down from point crosses odd number of edges */ /** point is considired inside when ray down from point crosses odd number of edges */
std::map<size_t, bool> is_inside; std::vector<size_t> intersections;
std::map<size_t, bool> on_the_edge; intersections.reserve(10);
size_t pos = std::upper_bound(this->sorted_x.begin() + 1, this->sorted_x.end() - 1, x) - this->sorted_x.begin() - 1; size_t pos = std::upper_bound(this->sorted_x.begin() + 1, this->sorted_x.end() - 1, x) - this->sorted_x.begin() - 1;
/** pos += n */ /** Here we doing: pos += n */
pos += this->edges_index_tree.size() / 2; pos += this->edges_index_tree.size() / 2;
do do
{ {
@ -366,7 +380,8 @@ bool BucketsPolygonIndex::find(const Point & point, size_t & id) const
{ {
if (l.x() == x && y >= l.y() && y <= r.y()) if (l.x() == x && y >= l.y() && y <= r.y())
{ {
on_the_edge[polygon_id] = true; /** point is on the edge */
update_result(found, id, polygon_id);
} }
continue; continue;
} }
@ -384,29 +399,22 @@ bool BucketsPolygonIndex::find(const Point & point, size_t & id) const
} }
if (edge_y == y) if (edge_y == y)
{ {
on_the_edge[polygon_id] = true; /** point is on the edge */
update_result(found, id, polygon_id);
} }
is_inside[polygon_id] ^= true; intersections.emplace_back(polygon_id);
} }
pos >>= 1; pos >>= 1;
} while (pos != 0); } while (pos != 0);
bool found = false; std::sort(intersections.begin(), intersections.end());
for (auto & [polygon_id, inside] : is_inside) for (size_t i = 0; i < intersections.size(); i += 2)
{ {
if (inside) if (i + 1 == intersections.size() || intersections[i] != intersections[i + 1])
{ {
found = true; update_result(found, id, intersections[i]);
id = polygon_id; break;
}
}
for (auto & [polygon_id, is_edge] : on_the_edge)
{
if (is_edge)
{
found = true;
id = polygon_id;
} }
} }