From 0bc1c6d91d966778f2443640282d79b7919242ad Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 16 Dec 2019 21:51:42 +0300
Subject: [PATCH] Changes after review of #8034

---
 dbms/src/Functions/geoToH3.cpp         | 6 +++---
 dbms/src/Functions/h3EdgeAngle.cpp     | 2 +-
 dbms/src/Functions/h3EdgeLengthM.cpp   | 2 +-
 dbms/src/Functions/h3GetResolution.cpp | 2 +-
 dbms/src/Functions/h3IsValid.cpp       | 2 +-
 dbms/src/Functions/h3kRing.cpp         | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dbms/src/Functions/geoToH3.cpp b/dbms/src/Functions/geoToH3.cpp
index 605d051ec94..40c267d8656 100644
--- a/dbms/src/Functions/geoToH3.cpp
+++ b/dbms/src/Functions/geoToH3.cpp
@@ -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;
         }
diff --git a/dbms/src/Functions/h3EdgeAngle.cpp b/dbms/src/Functions/h3EdgeAngle.cpp
index 1d8ac32dd36..18abc864c3e 100644
--- a/dbms/src/Functions/h3EdgeAngle.cpp
+++ b/dbms/src/Functions/h3EdgeAngle.cpp
@@ -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;
         }
diff --git a/dbms/src/Functions/h3EdgeLengthM.cpp b/dbms/src/Functions/h3EdgeLengthM.cpp
index bbaddfa2a96..37293426b45 100644
--- a/dbms/src/Functions/h3EdgeLengthM.cpp
+++ b/dbms/src/Functions/h3EdgeLengthM.cpp
@@ -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;
         }
diff --git a/dbms/src/Functions/h3GetResolution.cpp b/dbms/src/Functions/h3GetResolution.cpp
index b6dd260aa88..dfa84e8e076 100644
--- a/dbms/src/Functions/h3GetResolution.cpp
+++ b/dbms/src/Functions/h3GetResolution.cpp
@@ -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;
         }
diff --git a/dbms/src/Functions/h3IsValid.cpp b/dbms/src/Functions/h3IsValid.cpp
index c75e0041aa1..0c4123caf00 100644
--- a/dbms/src/Functions/h3IsValid.cpp
+++ b/dbms/src/Functions/h3IsValid.cpp
@@ -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;
         }
diff --git a/dbms/src/Functions/h3kRing.cpp b/dbms/src/Functions/h3kRing.cpp
index fe6385af8b9..55571472c16 100644
--- a/dbms/src/Functions/h3kRing.cpp
+++ b/dbms/src/Functions/h3kRing.cpp
@@ -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)