thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 01:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes after merge [#CLICKHOUSE-3].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-03 17:17:46 +03:00
parent a38bf1cbb3
commit 5a015a1475
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dbms/src/Functions/FunctionsFindCluster.h
View File

@ -195,7 +195,6 @@ private:
* findClusterValue(T, Array(T)) -> T
*
* T can be any numeric type.
*
*/
class FunctionFindClusterIndex : public IFunction
{
@ -245,16 +244,16 @@ public:
auto column_result = block.safeGetByPosition(result).type->createColumn();
auto out_untyped = column_result.get();
if ( !executeByCentroidsType<UInt8>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<UInt16>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<UInt32>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<UInt64>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int8>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int16>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int32>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int64>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Float32>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Float64>(in_untyped, out_untyped, centroids_array_untyped)
if ( !executeByCentroidsType<UInt8>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<UInt16>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<UInt32>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<UInt64>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int8>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int16>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int32>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Int64>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Float32>(in_untyped, out_untyped, centroids_array_untyped)
&& !executeByCentroidsType<Float64>(in_untyped, out_untyped, centroids_array_untyped)
)
{
throw Exception{
@ -282,17 +281,16 @@ protected:
if (!centroids.fill(centroids_array_untyped))
return false;
if ( !centroids.template findCluster<UInt8>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<UInt16>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<UInt32>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<UInt64>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int8>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int16>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int32>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int64>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Float32>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Float64>(in_untyped, out_untyped, getOperation())
)
if ( !centroids.template findCluster<UInt8>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<UInt16>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<UInt32>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<UInt64>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int8>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int16>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int32>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Int64>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Float32>(in_untyped, out_untyped, getOperation())
&& !centroids.template findCluster<Float64>(in_untyped, out_untyped, getOperation()))
{
throw Exception{
"Illegal column " + in_untyped->getName() + " of first argument of function " + getName(),
@ -301,7 +299,6 @@ protected:
return true;
}
};