thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix

Browse Source
This commit is contained in:
vdimir 2021-01-27 18:17:42 +03:00
parent 31027dbaf7
commit 36963e0eba
No known key found for this signature in database
GPG Key ID: F57B3E10A21DBB31
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Functions/FunctionsCoding.h
View File

@ -263,12 +263,10 @@ public:
static constexpr auto name = "IPv6StringToNum";
static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6StringToNum>(); }
static inline UInt32 parseIPv4(const char * pos)
static inline bool tryParseIPv4(const char * pos)
{
UInt32 result = 0;
DB::parseIPv4(pos, reinterpret_cast<unsigned char *>(&result));
return result;
return DB::parseIPv4(pos, reinterpret_cast<unsigned char *>(&result));
}
String getName() const override { return name; }
@ -301,18 +299,17 @@ public:
const ColumnString::Offsets & offsets_src = col_in->getOffsets();
size_t src_offset = 0;
char src_ipv4_buf[sizeof("::ffff:") + IPV4_MAX_TEXT_LENGTH + 1] = "::ffff:";
for (size_t out_offset = 0, i = 0; out_offset < vec_res.size(); out_offset += IPV6_BINARY_LENGTH, ++i)
{
/// For both cases below: In case of failure, the function parseIPv6 fills vec_res with zero bytes.
/// If the source IP address is parsable as an IPv4 address, then transform it into a valid IPv6 address.
/// Keeping it simple by just prefixing `::ffff:` to the IPv4 address to represent it as a valid IPv6 address.
if (parseIPv4(reinterpret_cast<const char *>(&vec_src[src_offset])))
if (tryParseIPv4(reinterpret_cast<const char *>(&vec_src[src_offset])))
{
char src_ipv4_buf[sizeof("::ffff:") + IPV4_MAX_TEXT_LENGTH + 1] = "::ffff:";
std::strcat(src_ipv4_buf, reinterpret_cast<const char *>(&vec_src[src_offset]));
parseIPv6(reinterpret_cast<const char *>(&src_ipv4_buf), reinterpret_cast<unsigned char *>(&vec_res[out_offset]));
parseIPv6(src_ipv4_buf, reinterpret_cast<unsigned char *>(&vec_res[out_offset]));
}
else
{

11
tests/queries/0_stateless/00725_ipv4_ipv6_domains.reference
View File

@ -49,5 +49,16 @@ FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF is ipv6 string: 1
::ffff:127.0.0.1 is ipv6 string: 1
::ffff:8.8.8.8 is ipv6 string: 1
2001:0DB8:AC10:FE01:FEED:BABE:CAFE:F00D is ipv6 string: 1
::ffff:0.0.0.0
::ffff:127.0.0.1
::ffff:127.0.0.1
::ffff:127.0.0.0
::ffff:127.0.0.1
::ffff:127.0.0.2
::ffff:127.0.0.3
::ffff:127.0.0.4
::ffff:127.0.0.5
::ffff:127.0.0.6
::ffff:127.0.0.7
::ffff:127.0.0.8
::ffff:127.0.0.9

2
tests/queries/0_stateless/00725_ipv4_ipv6_domains.sql
View File

@ -86,5 +86,7 @@ SELECT '2001:0DB8:AC10:FE01:FEED:BABE:CAFE:F00D is ipv6 string: ', isIPv6String(
-- IPV6 functions parse IPv4 addresses.
SELECT toIPv6('0.0.0.0');
SELECT toIPv6('127.0.0.1');
SELECT cutIPv6(IPv6StringToNum('127.0.0.1'), 0, 0);
SELECT toIPv6('127.0.0.' || toString(number)) FROM numbers(10);