Fixed build after merge [#CLICKHOUSE-3].

This commit is contained in:
Alexey Milovidov 2017-07-03 17:14:44 +03:00
parent 43daa720a4
commit 320b1e635b

View File

@ -16,12 +16,14 @@
#include <Common/HashTable/HashMap.h> #include <Common/HashTable/HashMap.h>
#include <DataTypes/EnrichedDataTypePtr.h> #include <DataTypes/EnrichedDataTypePtr.h>
namespace DB namespace DB
{ {
namespace ErrorCodes namespace ErrorCodes
{ {
extern const int BAD_ARGUMENTS; extern const int BAD_ARGUMENTS;
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
} }
enum ClusterOperation enum ClusterOperation
@ -108,8 +110,6 @@ public:
throw Exception{"Unexpected error in findCluster* function", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT}; throw Exception{"Unexpected error in findCluster* function", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
} }
private: private:
std::vector<Float64> centroids; std::vector<Float64> centroids;
@ -139,7 +139,6 @@ private:
// Index of the closest cluster, or 0 in case of just one cluster // Index of the closest cluster, or 0 in case of just one cluster
return index; return index;
} }
template <typename InputType, typename OutputType> template <typename InputType, typename OutputType>
@ -172,7 +171,6 @@ private:
throw Exception{"Unexpected error in findCluster* function", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT}; throw Exception{"Unexpected error in findCluster* function", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
return true; return true;
} }
else else
{ {
@ -188,13 +186,10 @@ private:
dst.push_back(centroids[find_centroid(CentroidsType(in_const->getData()))]); dst.push_back(centroids[find_centroid(CentroidsType(in_const->getData()))]);
else else
throw Exception{"Unexpected error in findCluster* function", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT}; throw Exception{"Unexpected error in findCluster* function", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
} }
return true; return true;
} }
}; };
@ -315,6 +310,7 @@ protected:
}; };
class FunctionFindClusterValue : public FunctionFindClusterIndex class FunctionFindClusterValue : public FunctionFindClusterIndex
{ {
public: public: