Merge pull request #18 from go-faster/feat/ip-stringer

feat(proto): implement Stringer for IPv{4,6}
ClickHouse · Jan 6, 2022 · f3c919d · f3c919d
2 parents f323d41 + c852ee2
commit f3c919d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/proto/ipv4.go b/proto/ipv4.go
@@ -14,6 +14,10 @@ import (
 // Use ToIP helper for convenience.
 type IPv4 uint32
 
+func (v IPv4) String() string {
+	return v.ToIP().String()
+}
+
 // ToIP represents IPv4 as netaddr.IP.
 func (v IPv4) ToIP() netaddr.IP {
 	var buf [4]byte

diff --git a/proto/ipv4_test.go b/proto/ipv4_test.go
@@ -10,6 +10,16 @@ import (
 	"github.com/go-faster/ch/internal/gold"
 )
 
+func TestIPv4_String(t *testing.T) {
+	for _, v := range []netaddr.IP{
+		netaddr.MustParseIP("127.0.0.1"),
+		netaddr.MustParseIP("1.1.1.1"),
+	} {
+		d := ToIPv4(v)
+		require.Equal(t, v.String(), d.String())
+	}
+}
+
 func TestColIPv4_NetAddr(t *testing.T) {
 	input := []netaddr.IP{
 		netaddr.MustParseIP("127.0.0.1"),

diff --git a/proto/ipv6.go b/proto/ipv6.go
@@ -5,8 +5,14 @@ import (
 )
 
 // IPv6 represents IPv6 address.
+//
+// Same as FixedString(16) internally in ClickHouse.
 type IPv6 [16]byte
 
+func (v IPv6) String() string {
+	return v.ToIP().String()
+}
+
 // ToIP represents IPv6 as netaddr.IP.
 func (v IPv6) ToIP() netaddr.IP {
 	return netaddr.IPv6Raw(v)

diff --git a/proto/ipv6_test.go b/proto/ipv6_test.go
@@ -11,6 +11,16 @@ import (
 	"github.com/go-faster/ch/internal/gold"
 )
 
+func TestIPv6_String(t *testing.T) {
+	for _, v := range []netaddr.IP{
+		netaddr.MustParseIP("2001:db8:ac10:fe01:feed:babe:cafe:0"),
+		netaddr.MustParseIP("2001:4860:4860::8888"),
+	} {
+		d := ToIPv6(v)
+		require.Equal(t, v.String(), d.String())
+	}
+}
+
 func IPv6FromInt(v int) IPv6 {
 	s := IPv6{}
 	binary.BigEndian.PutUint64(s[:], uint64(v))