From 334413da0044e69cbd87b1631d322d845082dd40 Mon Sep 17 00:00:00 2001 From: mohsaka <135669458+mohsaka@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:31:24 -0700 Subject: [PATCH] Format --- .../prestosql/tests/IPAddressFunctionsTest.cpp | 16 +++++++++------- .../functions/prestosql/types/IPPrefixType.cpp | 17 ++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/velox/functions/prestosql/tests/IPAddressFunctionsTest.cpp b/velox/functions/prestosql/tests/IPAddressFunctionsTest.cpp index 2dcb972dc1b9a..dcd86a8d65bea 100644 --- a/velox/functions/prestosql/tests/IPAddressFunctionsTest.cpp +++ b/velox/functions/prestosql/tests/IPAddressFunctionsTest.cpp @@ -23,15 +23,14 @@ namespace { class IPAddressTest : public functions::test::FunctionBaseTest { protected: - - std::optional castIPAddress( + std::optional castIPAddress( const std::optional input) { auto result = evaluateOnce( "cast(cast(c0 as ipaddress) as varchar)", input); return result; } - std::optional castIPPrefix( + std::optional castIPPrefix( const std::optional input) { auto result = evaluateOnce( "cast(cast(c0 as ipprefix) as varchar)", input); @@ -107,9 +106,13 @@ TEST_F(IPAddressTest, castFail) { EXPECT_THROW(castIPAddress("12.483.09.1"), VeloxUserError); EXPECT_THROW(castIPAddress("10.135.23.12.12"), VeloxUserError); EXPECT_THROW(castIPAddress("10.135.23"), VeloxUserError); - EXPECT_THROW(castIPAddress("q001:0db8:85a3:0001:0001:8a2e:0370:7334"), VeloxUserError); - EXPECT_THROW(castIPAddress("2001:0db8:85a3:542e:0001:0001:8a2e:0370:7334"), VeloxUserError); - EXPECT_THROW(castIPAddress("2001:0db8:85a3:0001:0001:8a2e:0370"), VeloxUserError); + EXPECT_THROW( + castIPAddress("q001:0db8:85a3:0001:0001:8a2e:0370:7334"), VeloxUserError); + EXPECT_THROW( + castIPAddress("2001:0db8:85a3:542e:0001:0001:8a2e:0370:7334"), + VeloxUserError); + EXPECT_THROW( + castIPAddress("2001:0db8:85a3:0001:0001:8a2e:0370"), VeloxUserError); EXPECT_THROW(castIPPrefix("12.135.23.12/-1"), VeloxUserError); EXPECT_THROW(castIPPrefix("10.135.23.12/33"), VeloxUserError); @@ -127,7 +130,6 @@ TEST_F(IPAddressTest, castFail) { EXPECT_THROW(castIPPrefix("64::ff9b::10/24"), VeloxUserError); EXPECT_THROW(castIPPrefix("64:face:book::10/24"), VeloxUserError); EXPECT_THROW(castIPPrefix("123.456.789.012/24"), VeloxUserError); - } TEST_F(IPAddressTest, castRoundTrip) { diff --git a/velox/functions/prestosql/types/IPPrefixType.cpp b/velox/functions/prestosql/types/IPPrefixType.cpp index 281a79992cce1..2407d1bec4ef4 100644 --- a/velox/functions/prestosql/types/IPPrefixType.cpp +++ b/velox/functions/prestosql/types/IPPrefixType.cpp @@ -125,13 +125,16 @@ class IPPrefixCastOperator : public exec::CastOperator { .to_bytes(); } else { auto v6Net = boost::asio::ip::make_network_v6(ipAddressString); - if(addr.to_v6().is_v4_mapped()){ - auto v4Addr = boost::asio::ip::make_address_v4(boost::asio::ip::v4_mapped, addr.to_v6()); - auto v4Net = boost::asio::ip::make_network_v4(v4Addr, (uint8_t)v6Net.prefix_length()); - addrBytes = boost::asio::ip::make_address_v6( - boost::asio::ip::v4_mapped, v4Net.canonical().address()) - .to_bytes(); - }else{ + if (addr.to_v6().is_v4_mapped()) { + auto v4Addr = boost::asio::ip::make_address_v4( + boost::asio::ip::v4_mapped, addr.to_v6()); + auto v4Net = boost::asio::ip::make_network_v4( + v4Addr, (uint8_t)v6Net.prefix_length()); + addrBytes = + boost::asio::ip::make_address_v6( + boost::asio::ip::v4_mapped, v4Net.canonical().address()) + .to_bytes(); + } else { addrBytes = v6Net.canonical().address().to_bytes(); } res.prefix = (uint8_t)v6Net.prefix_length();