Parse inet as net.IP

Author: sylwiaszunejko

helpers.go

@@ -28,6 +28,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"math/big"
+	"net"
 	"reflect"
 	"strconv"
 	"strings"
@@ -43,7 +44,9 @@ type RowData struct {
 
 func goType(t TypeInfo) (reflect.Type, error) {
 	switch t.Type() {
-	case TypeVarchar, TypeAscii, TypeInet, TypeText:
+	case TypeInet:
+		return reflect.TypeOf(*new(net.IP)), nil
+	case TypeVarchar, TypeAscii, TypeText:
 		return reflect.TypeOf(*new(string)), nil
 	case TypeBigInt, TypeCounter:
 		return reflect.TypeOf(*new(int64)), nil

host_source.go

@@ -556,11 +556,10 @@ func hostInfoFromMap(row map[string]interface{}, host *HostInfo, translateAddres
 			}
 			host.version.Set(version)
 		case "peer":
-			ip, ok := value.(string)
+			host.peer, ok = value.(net.IP)
 			if !ok {
 				return nil, fmt.Errorf(assertErrorMsg, "peer")
 			}
-			host.peer = net.ParseIP(ip)
 		case "cluster_name":
 			host.clusterName, ok = value.(string)
 			if !ok {
@@ -572,35 +571,30 @@ func hostInfoFromMap(row map[string]interface{}, host *HostInfo, translateAddres
 				return nil, fmt.Errorf(assertErrorMsg, "partitioner")
 			}
 		case "broadcast_address":
-			ip, ok := value.(string)
+			host.broadcastAddress, ok = value.(net.IP)
 			if !ok {
 				return nil, fmt.Errorf(assertErrorMsg, "broadcast_address")
 			}
-			host.broadcastAddress = net.ParseIP(ip)
 		case "preferred_ip":
-			ip, ok := value.(string)
+			host.preferredIP, ok = value.(net.IP)
 			if !ok {
 				return nil, fmt.Errorf(assertErrorMsg, "preferred_ip")
 			}
-			host.preferredIP = net.ParseIP(ip)
 		case "rpc_address":
-			ip, ok := value.(string)
+			host.rpcAddress, ok = value.(net.IP)
 			if !ok {
 				return nil, fmt.Errorf(assertErrorMsg, "rpc_address")
 			}
-			host.rpcAddress = net.ParseIP(ip)
 		case "native_address":
-			ip, ok := value.(string)
+			host.rpcAddress, ok = value.(net.IP)
 			if !ok {
 				return nil, fmt.Errorf(assertErrorMsg, "native_address")
 			}
-			host.rpcAddress = net.ParseIP(ip)
 		case "listen_address":
-			ip, ok := value.(string)
+			host.listenAddress, ok = value.(net.IP)
 			if !ok {
 				return nil, fmt.Errorf(assertErrorMsg, "listen_address")
 			}
-			host.listenAddress = net.ParseIP(ip)
 		case "native_port":
 			native_port, ok := value.(int)
 			if !ok {