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

Field: removed useless hash function [#METR-2807].

Browse Source
This commit is contained in:
Alexey Milovidov 2013-11-02 22:20:58 +00:00
parent 831ec21083
commit a907109ff8
1 changed files with 2 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dbms/include/DB/Core/Field.h
View File

@ -20,31 +20,10 @@
namespace DB
{
class Field;
typedef std::vector<Field> Array; /// Значение типа "массив"
}
namespace std
{
namespace tr1
{
template <>
struct hash<DB::Field>
{
inline size_t operator()(const DB::Field & x) const;
};
class Field;
typedef std::vector<Field> Array; /// Значение типа "массив"
template <>
struct hash<DB::Array>
{
inline size_t operator()(const DB::Array & x) const;
};
}
}
namespace DB
{
using Poco::SharedPtr;
@ -287,24 +266,6 @@ public:
return !(*this == rhs);
}
size_t hash() const
{
size_t h;
switch (which)
{
case Types::Null: h = 0; break;
case Types::UInt64: h = std::tr1::hash<UInt64>()(get<UInt64>()); break;
case Types::Int64: h = std::tr1::hash<Int64>()(get<Int64>()); break;
case Types::Float64: h = std::tr1::hash<Float64>()(get<Float64>()); break;
case Types::String: h = std::tr1::hash<String>()(get<String>()); break;
case Types::Array: h = std::tr1::hash<Array>()(get<Array>()); break;
default:
throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
}
return h ^ std::tr1::hash<int>()(which);
}
private:
/// Хватает с запасом
static const size_t storage_size = DBMS_TOTAL_FIELD_SIZE - sizeof(Types::Which);
@ -854,27 +815,4 @@ namespace DB
}
namespace std
{
namespace tr1
{
inline size_t hash<DB::Field>::operator()(const DB::Field & x) const
{
return x.hash();
}
/// Осторожно, это может оказаться отстойной хеш-функцией!
inline size_t hash<DB::Array>::operator()(const DB::Array & x) const
{
size_t h = 0;
for (size_t i = 0; i < x.size(); ++i)
{
h = h * 17 + x[i].hash();
}
return h;
}
}
}
#undef DBMS_TOTAL_FIELD_SIZE