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

fix hash functions for IPv4

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2023-01-08 20:58:09 +00:00
parent 0eaf05a2dd
commit 6ec1592a9f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/DataTypes/DataTypeIPv4andIPv6.h
View File

@ -37,6 +37,9 @@ public:
bool shouldAlignRightInPrettyFormats() const override { return false; } bool shouldAlignRightInPrettyFormats() const override { return false; }
bool textCanContainOnlyValidUTF8() const override { return true; } bool textCanContainOnlyValidUTF8() const override { return true; }
bool isComparable() const override { return true; } bool isComparable() const override { return true; }
bool isValueRepresentedByNumber() const override { return true; }
bool isValueRepresentedByInteger() const override { return true; }
bool isValueRepresentedByUnsignedInteger() const override { return true; }
bool isValueUnambiguouslyRepresentedInContiguousMemoryRegion() const override { return true; } bool isValueUnambiguouslyRepresentedInContiguousMemoryRegion() const override { return true; }
bool isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion() const override { return true; } bool isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion() const override { return true; }
bool haveMaximumSizeOfValue() const override { return true; } bool haveMaximumSizeOfValue() const override { return true; }

5
src/Functions/FunctionsConsistentHashing.h
View File

@ -6,6 +6,7 @@
#include <Functions/FunctionHelpers.h> #include <Functions/FunctionHelpers.h>
#include <Functions/IFunction.h> #include <Functions/IFunction.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
#include <base/IPv4andIPv6.h>
#include <Interpreters/Context_fwd.h> #include <Interpreters/Context_fwd.h>
@ -43,7 +44,7 @@ public:
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{ {
if (!isInteger(arguments[0])) if (!isInteger(arguments[0]) && !isIPv4(arguments[0]))
throw Exception("Illegal type " + arguments[0]->getName() + " of the first argument of function " + getName(), throw Exception("Illegal type " + arguments[0]->getName() + " of the first argument of function " + getName(),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
@ -132,6 +133,8 @@ private:
executeType<Int32>(hash_col, num_buckets, res_col.get()); executeType<Int32>(hash_col, num_buckets, res_col.get());
else if (which.isInt64()) else if (which.isInt64())
executeType<Int64>(hash_col, num_buckets, res_col.get()); executeType<Int64>(hash_col, num_buckets, res_col.get());
else if (which.isIPv4())
executeType<IPv4>(hash_col, num_buckets, res_col.get());
else else
throw Exception("Illegal type " + hash_type->getName() + " of the first argument of function " + getName(), throw Exception("Illegal type " + hash_type->getName() + " of the first argument of function " + getName(),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);

3
src/Functions/FunctionsHashing.h
View File

@ -52,6 +52,7 @@
#include <Functions/FunctionHelpers.h> #include <Functions/FunctionHelpers.h>
#include <Functions/PerformanceAdaptors.h> #include <Functions/PerformanceAdaptors.h>
#include <Common/TargetSpecific.h> #include <Common/TargetSpecific.h>
#include <base/IPv4andIPv6.h>
#include <base/range.h> #include <base/range.h>
#include <base/bit_cast.h> #include <base/bit_cast.h>
@ -838,6 +839,8 @@ public:
return executeType<Decimal32>(arguments); return executeType<Decimal32>(arguments);
else if (which.isDecimal64()) else if (which.isDecimal64())
return executeType<Decimal64>(arguments); return executeType<Decimal64>(arguments);
else if (which.isIPv4())
return executeType<IPv4>(arguments);
else else
throw Exception("Illegal type " + arguments[0].type->getName() + " of argument of function " + getName(), throw Exception("Illegal type " + arguments[0].type->getName() + " of argument of function " + getName(),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);