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

Changes after review of #8034

Browse Source
This commit is contained in:
Alexey Milovidov 2019-12-16 21:51:42 +03:00
parent 0042c8271e
commit 0bc1c6d91d
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Functions/geoToH3.cpp
View File

@ -74,10 +74,10 @@ public:
const UInt8 res = col_res->getUInt(row);
GeoCoord coord;
coord.lon = H3_EXPORT(degsToRads)(lon);
coord.lat = H3_EXPORT(degsToRads)(lat);
coord.lon = degsToRads(lon);
coord.lat = degsToRads(lat);
H3Index hindex = H3_EXPORT(geoToH3)(&coord, res);
H3Index hindex = geoToH3(&coord, res);
dst_data[row] = hindex;
}

2
dbms/src/Functions/h3EdgeAngle.cpp
View File

@ -48,7 +48,7 @@ public:
const int resolution = col_hindex->getUInt(row);
// Numerical constant is 180 degrees / pi / Earth radius, Earth radius is from h3 sources
Float64 res = 8.99320592271288084e-6 * H3_EXPORT(edgeLengthM)(resolution);
Float64 res = 8.99320592271288084e-6 * edgeLengthM(resolution);
dst_data[row] = res;
}

2
dbms/src/Functions/h3EdgeLengthM.cpp
View File

@ -52,7 +52,7 @@ public:
{
const int resolution = col_hindex->getUInt(row);
Float64 res = H3_EXPORT(edgeLengthM)(resolution);
Float64 res = edgeLengthM(resolution);
dst_data[row] = res;
}

2
dbms/src/Functions/h3GetResolution.cpp
View File

@ -47,7 +47,7 @@ public:
{
const UInt64 hindex = col_hindex->getUInt(row);
UInt8 res = H3_EXPORT(h3GetResolution)(hindex);
UInt8 res = h3GetResolution(hindex);
dst_data[row] = res;
}

2
dbms/src/Functions/h3IsValid.cpp
View File

@ -47,7 +47,7 @@ public:
{
const UInt64 hindex = col_hindex->getUInt(row);
UInt8 is_valid = H3_EXPORT(h3IsValid)(hindex) == 0 ? 0 : 1;
UInt8 is_valid = h3IsValid(hindex) == 0 ? 0 : 1;
dst_data[row] = is_valid;
}

4
dbms/src/Functions/h3kRing.cpp
View File

@ -63,9 +63,9 @@ public:
const H3Index origin_hindex = col_hindex->getUInt(row);
const int k = col_k->getInt(row);
const auto vec_size = H3_EXPORT(maxKringSize)(k);
const auto vec_size = maxKringSize(k);
hindex_vec.resize(vec_size);
H3_EXPORT(kRing)(origin_hindex, k, hindex_vec.data());
kRing(origin_hindex, k, hindex_vec.data());
dst_data.reserve(dst_data.size() + vec_size);
for (auto hindex : hindex_vec)