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

generalize implementation for h3PointDist{M,Km,Rads}

Browse Source
This commit is contained in:
bharatnc 2022-02-21 11:32:02 -08:00
parent d1056e1147
commit 8e19415992
10 changed files with 70 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Functions/h3PointDistRads.cpp → src/Functions/h3PointDist.cpp
View File

@ -25,13 +25,14 @@ extern const int ILLEGAL_COLUMN;
namespace
{
class FunctionH3PointDistRads final : public IFunction
template <class Impl>
class FunctionH3PointDist final : public IFunction
{
public:
static constexpr auto name = "h3PointDistRads";
static constexpr auto name = Impl::name;
static constexpr auto function = Impl::function;
static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3PointDistRads>(); }
static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3PointDist>(); }
std::string getName() const override { return name; }
@ -109,7 +110,8 @@ public:
LatLng point1 = {degsToRads(lat1), degsToRads(lon1)};
LatLng point2 = {degsToRads(lat2), degsToRads(lon2)};
Float64 res = distanceRads(&point1, &point2);
// function will be equivalent to distanceM or distanceKm or distanceRads
Float64 res = function(&point1, &point2);
dst_data[row] = res;
}
@ -119,10 +121,25 @@ public:
}
void registerFunctionH3PointDistRads(FunctionFactory & factory)
{
factory.registerFunction<FunctionH3PointDistRads>();
}
struct H3PointDistM {
static constexpr auto name = "h3PointDistM";
static constexpr auto function = distanceM;
};
struct H3PointDistKm {
static constexpr auto name = "h3PointDistKm";
static constexpr auto function = distanceKm;
};
struct H3PointDistRads {
static constexpr auto name = "h3PointDistRads";
static constexpr auto function = distanceRads;
};
void registerFunctionH3PointDistM(FunctionFactory & factory) { factory.registerFunction<FunctionH3PointDist<H3PointDistM>>(); }
void registerFunctionH3PointDistKm(FunctionFactory & factory) { factory.registerFunction<FunctionH3PointDist<H3PointDistKm>>(); }
void registerFunctionH3PointDistRads(FunctionFactory & factory) { factory.registerFunction<FunctionH3PointDist<H3PointDistRads>>(); }
}

129
src/Functions/h3PointDistKm.cpp
View File

@ -1,129 +0,0 @@
#include "config_functions.h"
#if USE_H3
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypeTuple.h>
#include <Functions/FunctionFactory.h>
#include <Functions/IFunction.h>
#include <IO/WriteHelpers.h>
#include <Common/typeid_cast.h>
#include <base/range.h>
#include <constants.h>
#include <h3api.h>
namespace DB
{
namespace ErrorCodes
{
extern const int ILLEGAL_TYPE_OF_ARGUMENT;
extern const int ILLEGAL_COLUMN;
}
namespace
{
class FunctionH3PointDistKm final : public IFunction
{
public:
static constexpr auto name = "h3PointDistKm";
static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3PointDistKm>(); }
std::string getName() const override { return name; }
size_t getNumberOfArguments() const override { return 4; }
bool useDefaultImplementationForConstants() const override { return true; }
bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{
for (size_t i = 0; i < getNumberOfArguments(); ++i)
{
const auto * arg = arguments[i].get();
if (!WhichDataType(arg).isFloat64())
throw Exception(
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
"Illegal type {} of argument {} of function {}. Must be Float64",
arg->getName(), i, getName());
}
return std::make_shared<DataTypeFloat64>();
}
ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
{
const auto * col_lat1 = checkAndGetColumn<ColumnFloat64>(arguments[0].column.get());
if (!col_lat1)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[0].type->getName(),
1,
getName());
const auto & data_lat1 = col_lat1->getData();
const auto * col_lon1 = checkAndGetColumn<ColumnFloat64>(arguments[1].column.get());
if (!col_lon1)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[1].type->getName(),
2,
getName());
const auto & data_lon1 = col_lon1->getData();
const auto * col_lat2 = checkAndGetColumn<ColumnFloat64>(arguments[2].column.get());
if (!col_lat2)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[2].type->getName(),
3,
getName());
const auto & data_lat2 = col_lat2->getData();
const auto * col_lon2 = checkAndGetColumn<ColumnFloat64>(arguments[3].column.get());
if (!col_lon2)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[3].type->getName(),
4,
getName());
const auto & data_lon2 = col_lon2->getData();
auto dst = ColumnVector<Float64>::create();
auto & dst_data = dst->getData();
dst_data.resize(input_rows_count);
for (size_t row = 0; row < input_rows_count; ++row)
{
const double lat1 = data_lat1[row];
const double lon1 = data_lon1[row];
const auto lat2 = data_lat2[row];
const auto lon2 = data_lon2[row];
LatLng point1 = {degsToRads(lat1), degsToRads(lon1)};
LatLng point2 = {degsToRads(lat2), degsToRads(lon2)};
Float64 res = distanceKm(&point1, &point2);
dst_data[row] = res;
}
return dst;
}
};
}
void registerFunctionH3PointDistKm(FunctionFactory & factory)
{
factory.registerFunction<FunctionH3PointDistKm>();
}
}
#endif

129
src/Functions/h3PointDistM.cpp
View File

@ -1,129 +0,0 @@
#include "config_functions.h"
#if USE_H3
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypeTuple.h>
#include <Functions/FunctionFactory.h>
#include <Functions/IFunction.h>
#include <IO/WriteHelpers.h>
#include <Common/typeid_cast.h>
#include <base/range.h>
#include <constants.h>
#include <h3api.h>
namespace DB
{
namespace ErrorCodes
{
extern const int ILLEGAL_TYPE_OF_ARGUMENT;
extern const int ILLEGAL_COLUMN;
}
namespace
{
class FunctionH3PointDistM final : public IFunction
{
public:
static constexpr auto name = "h3PointDistM";
static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3PointDistM>(); }
std::string getName() const override { return name; }
size_t getNumberOfArguments() const override { return 4; }
bool useDefaultImplementationForConstants() const override { return true; }
bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{
for (size_t i = 0; i < getNumberOfArguments(); ++i)
{
const auto * arg = arguments[i].get();
if (!WhichDataType(arg).isFloat64())
throw Exception(
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
"Illegal type {} of argument {} of function {}. Must be Float64",
arg->getName(), i, getName());
}
return std::make_shared<DataTypeFloat64>();
}
ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
{
const auto * col_lat1 = checkAndGetColumn<ColumnFloat64>(arguments[0].column.get());
if (!col_lat1)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[0].type->getName(),
1,
getName());
const auto & data_lat1 = col_lat1->getData();
const auto * col_lon1 = checkAndGetColumn<ColumnFloat64>(arguments[1].column.get());
if (!col_lon1)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[1].type->getName(),
2,
getName());
const auto & data_lon1 = col_lon1->getData();
const auto * col_lat2 = checkAndGetColumn<ColumnFloat64>(arguments[2].column.get());
if (!col_lat2)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[2].type->getName(),
3,
getName());
const auto & data_lat2 = col_lat2->getData();
const auto * col_lon2 = checkAndGetColumn<ColumnFloat64>(arguments[3].column.get());
if (!col_lon2)
throw Exception(
ErrorCodes::ILLEGAL_COLUMN,
"Illegal type {} of argument {} of function {}. Must be Float64",
arguments[3].type->getName(),
4,
getName());
const auto & data_lon2 = col_lon2->getData();
auto dst = ColumnVector<Float64>::create();
auto & dst_data = dst->getData();
dst_data.resize(input_rows_count);
for (size_t row = 0; row < input_rows_count; ++row)
{
const double lat1 = data_lat1[row];
const double lon1 = data_lon1[row];
const auto lat2 = data_lat2[row];
const auto lon2 = data_lon2[row];
LatLng point1 = {degsToRads(lat1), degsToRads(lon1)};
LatLng point2 = {degsToRads(lat2), degsToRads(lon2)};
Float64 res = distanceM(&point1, &point2);
dst_data[row] = res;
}
return dst;
}
};
}
void registerFunctionH3PointDistM(FunctionFactory & factory)
{
factory.registerFunction<FunctionH3PointDistM>();
}
}
#endif

39
tests/queries/0_stateless/02212_h3_point_dist.reference Normal file
View File

@ -0,0 +1,39 @@
-- select h3PointDistM(lat1, lon1,lat2, lon2) AS k from table1 order by k;
111195.05197522961
111228.91103262542
111901.0753744776
111901.07537447763
111901.07537447763
157225.60925091387
157249.55851177874
222457.78082261496
223528.36944466401
223528.36944466401
400900.66882205213
2223901.039504589
-- select h3PointDistKm(lat1, lon1,lat2, lon2) AS k from table1 order by k;
111.1950519752296
111.22891103262542
111.9010753744776
111.90107537447763
111.90107537447763
157.22560925091386
157.24955851177873
222.45778082261498
223.528369444664
223.528369444664
400.9006688220521
2223.901039504589
-- select h3PointDistRads(lat1, lon1,lat2, lon2) AS k from table1 order by k;
0.01745329251994332
0.017458607073268143
0.017564110696598745
0.01756411069659875
0.01756411069659875
0.024678297290546682
0.02468205639176644
0.034917207673048706
0.03508524839120321
0.03508524839120321
0.06292579139178688
0.3490658503988659

5
tests/queries/0_stateless/02212_h3_point_dist_rads.sql → tests/queries/0_stateless/02212_h3_point_dist.sql
View File

@ -17,6 +17,11 @@ INSERT INTO table1 VALUES(-90, 181, -89, 182);
INSERT INTO table1 VALUES(-84, 181, -83, 182);
INSERT INTO table1 VALUES(-87, 0, -85, 3);
select '-- select h3PointDistM(lat1, lon1,lat2, lon2) AS k from table1 order by k;';
select h3PointDistM(lat1, lon1,lat2, lon2) AS k from table1 order by k;
select '-- select h3PointDistKm(lat1, lon1,lat2, lon2) AS k from table1 order by k;';
select h3PointDistKm(lat1, lon1,lat2, lon2) AS k from table1 order by k;
select '-- select h3PointDistRads(lat1, lon1,lat2, lon2) AS k from table1 order by k;';
select h3PointDistRads(lat1, lon1,lat2, lon2) AS k from table1 order by k;
DROP TABLE table1

12
tests/queries/0_stateless/02212_h3_point_dist_km.reference
View File

@ -1,12 +0,0 @@
111.1950519752296
111.22891103262542
111.9010753744776
111.90107537447763
111.90107537447763
157.22560925091386
157.24955851177873
222.45778082261498
223.528369444664
223.528369444664
400.9006688220521
2223.901039504589

22
tests/queries/0_stateless/02212_h3_point_dist_km.sql
View File

@ -1,22 +0,0 @@
-- Tags: no-fasttest
DROP TABLE IF EXISTS table1;
CREATE TABLE table1 (lat1 Float64, lon1 Float64, lat2 Float64, lon2 Float64) ENGINE = Memory;
INSERT INTO table1 VALUES(-10.0 ,0.0, 10.0, 0.0);
INSERT INTO table1 VALUES(-1, -1, 2, 1);
INSERT INTO table1 VALUES(0, 2, 1, 3);
INSERT INTO table1 VALUES(-2, -3, -1, -2);
INSERT INTO table1 VALUES(-87, 0, -85, 3);
INSERT INTO table1 VALUES(-89, 1, -88, 2);
INSERT INTO table1 VALUES(-84, 1, -83, 2);
INSERT INTO table1 VALUES(-88, 90, -86, 91);
INSERT INTO table1 VALUES(-84, -91, -83, -90);
INSERT INTO table1 VALUES(-90, 181, -89, 182);
INSERT INTO table1 VALUES(-84, 181, -83, 182);
INSERT INTO table1 VALUES(-87, 0, -85, 3);
select h3PointDistKm(lat1, lon1,lat2, lon2) AS k from table1 order by k;
DROP TABLE table1

12
tests/queries/0_stateless/02212_h3_point_dist_m.reference
View File

@ -1,12 +0,0 @@
111195.05197522961
111228.91103262542
111901.0753744776
111901.07537447763
111901.07537447763
157225.60925091387
157249.55851177874
222457.78082261496
223528.36944466401
223528.36944466401
400900.66882205213
2223901.039504589

22
tests/queries/0_stateless/02212_h3_point_dist_m.sql
View File

@ -1,22 +0,0 @@
-- Tags: no-fasttest
DROP TABLE IF EXISTS table1;
CREATE TABLE table1 (lat1 Float64, lon1 Float64, lat2 Float64, lon2 Float64) ENGINE = Memory;
INSERT INTO table1 VALUES(-10.0 ,0.0, 10.0, 0.0);
INSERT INTO table1 VALUES(-1, -1, 2, 1);
INSERT INTO table1 VALUES(0, 2, 1, 3);
INSERT INTO table1 VALUES(-2, -3, -1, -2);
INSERT INTO table1 VALUES(-87, 0, -85, 3);
INSERT INTO table1 VALUES(-89, 1, -88, 2);
INSERT INTO table1 VALUES(-84, 1, -83, 2);
INSERT INTO table1 VALUES(-88, 90, -86, 91);
INSERT INTO table1 VALUES(-84, -91, -83, -90);
INSERT INTO table1 VALUES(-90, 181, -89, 182);
INSERT INTO table1 VALUES(-84, 181, -83, 182);
INSERT INTO table1 VALUES(-87, 0, -85, 3);
select h3PointDistM(lat1, lon1,lat2, lon2) AS k from table1 order by k;
DROP TABLE table1

12
tests/queries/0_stateless/02212_h3_point_dist_rads.reference
View File

@ -1,12 +0,0 @@
0.01745329251994332
0.017458607073268143
0.017564110696598745
0.01756411069659875
0.01756411069659875
0.024678297290546682
0.02468205639176644
0.034917207673048706
0.03508524839120321
0.03508524839120321
0.06292579139178688
0.3490658503988659