thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-15 20:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lr edges check

Browse Source
This commit is contained in:
Arthur Petukhovsky 2020-05-14 21:01:44 +03:00
parent 9ab97fff3c
commit 5fa5c06592
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,15 +206,15 @@ void BucketsPolygonIndex::indexBuild(const std::vector<Polygon> & polygons)
const Coord lx = this->sorted_x[l]; const Coord lx = this->sorted_x[l];
const Coord rx = this->sorted_x[r]; const Coord rx = this->sorted_x[r];
/** removing edges where right_point.x < lx */ /** removing edges where right_point.x <= lx */
while (!interesting_edges.empty() && interesting_edges.begin()->r.x() < lx) while (!interesting_edges.empty() && interesting_edges.begin()->r.x() <= lx)
{ {
edge_right[interesting_edges.begin()->edge_id] = l; edge_right[interesting_edges.begin()->edge_id] = l;
interesting_edges.erase(interesting_edges.begin()); interesting_edges.erase(interesting_edges.begin());
} }
/** adding edges where left_point.x <= rx */ /** adding edges where left_point.x < rx */
for (; edges_it < this->all_edges.size() && this->all_edges[edges_it].l.x() <= rx; ++edges_it) for (; edges_it < this->all_edges.size() && this->all_edges[edges_it].l.x() < rx; ++edges_it)
{ {
interesting_edges.insert(this->all_edges[edges_it]); interesting_edges.insert(this->all_edges[edges_it]);
edge_left[this->all_edges[edges_it].edge_id] = l; edge_left[this->all_edges[edges_it].edge_id] = l;
@ -262,7 +262,7 @@ void BucketsPolygonIndex::indexAddRing(const Ring & ring, size_t polygon_id)
Point a = ring[prev]; Point a = ring[prev];
Point b = ring[i]; Point b = ring[i];
// making a.x <= b.x /** making a.x <= b.x */
if (a.x() > b.x()) if (a.x() > b.x())
{ {
std::swap(a, b); std::swap(a, b);
@ -398,12 +398,6 @@ bool BucketsPolygonIndex::find(const Point & point, size_t & id) const
const Point & r = edge.r; const Point & r = edge.r;
size_t polygon_id = edge.polygon_id; size_t polygon_id = edge.polygon_id;
/** check if point outside of edge's x bounds */
if (x < l.x() || x >= r.x())
{
continue;
}
Coord edge_y = x * edge.k + edge.b; Coord edge_y = x * edge.k + edge.b;
if (edge_y <= y) if (edge_y <= y)
{ {