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

Performance tests fix H3

Browse Source
This commit is contained in:
Maksim Kita 2022-02-18 15:57:54 +00:00
parent 652980eec3
commit 80b0efb367
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Functions/geoToH3.cpp
View File

@ -71,7 +71,11 @@ public:
ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
{ {
const auto * col_lon = checkAndGetColumn<ColumnFloat64>(arguments[0].column.get()); auto non_const_arguments = arguments;
for (auto & argument : non_const_arguments)
argument.column = argument.column->convertToFullColumnIfConst();
const auto * col_lon = checkAndGetColumn<ColumnFloat64>(non_const_arguments[0].column.get());
if (!col_lon) if (!col_lon)
throw Exception( throw Exception(
ErrorCodes::ILLEGAL_COLUMN, ErrorCodes::ILLEGAL_COLUMN,
@ -81,7 +85,7 @@ public:
getName()); getName());
const auto & data_lon = col_lon->getData(); const auto & data_lon = col_lon->getData();
const auto * col_lat = checkAndGetColumn<ColumnFloat64>(arguments[1].column.get()); const auto * col_lat = checkAndGetColumn<ColumnFloat64>(non_const_arguments[1].column.get());
if (!col_lat) if (!col_lat)
throw Exception( throw Exception(
ErrorCodes::ILLEGAL_COLUMN, ErrorCodes::ILLEGAL_COLUMN,
@ -91,7 +95,7 @@ public:
getName()); getName());
const auto & data_lat = col_lat->getData(); const auto & data_lat = col_lat->getData();
const auto * col_res = checkAndGetColumn<ColumnUInt8>(arguments[2].column.get()); const auto * col_res = checkAndGetColumn<ColumnUInt8>(non_const_arguments[2].column.get());
if (!col_res) if (!col_res)
throw Exception( throw Exception(
ErrorCodes::ILLEGAL_COLUMN, ErrorCodes::ILLEGAL_COLUMN,

4
tests/performance/h3.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<!-- Moscow coordinates, maximum precision. NOTE: H3 library is extraordinary slow. --> <!-- Moscow coordinates, maximum precision. NOTE: H3 library is extraordinary slow. -->
<query>SELECT count() FROM zeros(100000) WHERE NOT ignore(geoToH3(37.62 + rand(1) / 0x100000000, 55.75 + rand(2) / 0x100000000, 15))</query> <query>SELECT count() FROM zeros(100000) WHERE NOT ignore(geoToH3(37.62 + rand(1) / 0x100000000, 55.75 + rand(2) / 0x100000000, toUInt8(15)))</query>
</test> </test>