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

METR-22322: add functional test

Browse Source
This commit is contained in:
serebrserg 2016-08-15 18:00:02 +03:00
parent c8bbb26802
commit 191d8b9707
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/include/DB/Functions/FunctionsGeo.h
View File

@ -69,13 +69,11 @@ private:
instrs_t getInstructions(const Block & block, const ColumnNumbers & arguments, bool & out_const)
{
instrs_t result;
out_const = true;
int arg_idx = 0;
for (const auto arg_pos : arguments)
for (const auto arg_idx : ext::range(0, arguments.size()))
{
const auto column = block.getByPosition(arg_pos).column.get();
const auto column = block.getByPosition(arguments[arg_idx]).column.get();
if (const auto col = typeid_cast<const ColumnVector<Float64> *>(column))
{
@ -87,12 +85,8 @@ private:
result[arg_idx] = instr_t{instr_type::get_const_float_64, col};
}
else
{
throw Exception("Illegal column " + column->getName() + " of argument of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
}
++arg_idx;
}
return result;
@ -148,9 +142,9 @@ private:
for (const auto idx : ext::range(0, instrs.size()))
{
if (instr_type::get_float_64 == instrs[idx].first)
vals[idx] = static_cast<const ColumnVector<Float64> *>(block.getByPosition(arguments[idx]).column.get())->getData()[row];
vals[idx] = static_cast<const ColumnVector<Float64> *>(instrs[idx].second)->getData()[row];
else if (instr_type::get_const_float_64 == instrs[idx].first)
vals[idx] = static_cast<const ColumnConst<Float64> *>(block.getByPosition(arguments[idx]).column.get())->getData();
vals[idx] = static_cast<const ColumnConst<Float64> *>(instrs[idx].second)->getData();
else
throw std::logic_error{"unknown instr_type"};
}

3
dbms/tests/queries/0_stateless/00362_great_circle_distance.reference Normal file
View File

@ -0,0 +1,3 @@
343417
342558
0

6
dbms/tests/queries/0_stateless/00362_great_circle_distance.sql Normal file
View File

@ -0,0 +1,6 @@
SELECT floor(greatCircleDistance(33.3, 55.3, 38.7, 55.1)) AS distance;
SELECT floor(greatCircleDistance(33.3 + v, 55.3 + v, 38.7 + v , 55.1 + v)) AS distance from
(
select number + 0.1 as v from system.numbers limit 1
);
SELECT floor(greatCircleDistance(33.3, 55.3, 33.3, 55.3)) AS distance;