Skip to content

fix: Don't lose IP data in AppendValueFromString #2236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 2 commits into from
Jul 23, 2025
Merged

fix: Don't lose IP data in AppendValueFromString #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c411db
Revert "fix: Validate and normalize inet test values (#2205)"
erezrokah Jul 22, 2025
0777f97
fix: Dont lose IP data in `AppendValueFromString`
erezrokah Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions schema/testdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/base64"
"fmt"
"math/rand"
"net"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -317,11 +316,9 @@ func (tg TestDataGenerator) getExampleJSON(colName string, dataType arrow.DataTy

// Generate a CIDR prefix length between 8 and 30
cidr := 8 + rnd.Intn(23)
input := fmt.Sprintf(`%d.%d.%d.%d/%d`, ip[0], ip[1], ip[2], ip[3], cidr)
_, data, _ := net.ParseCIDR(input)

// Format as an IP address with CIDR notation
return fmt.Sprintf(`"%s"`, data.String())
return fmt.Sprintf(`"%d.%d.%d.%d/%d"`, ip[0], ip[1], ip[2], ip[3], cidr)
}
if arrow.TypeEqual(dataType, types.ExtensionTypes.MAC) {
mac := make([]byte, 6)
Expand Down
3 changes: 2 additions & 1 deletion types/inet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ func (b *InetBuilder) AppendValueFromString(s string) error {
b.AppendNull()
return nil
}
_, data, err := net.ParseCIDR(s)
ip, data, err := net.ParseCIDR(s)
if err != nil {
return err
}
data.IP = ip
b.Append(data)
return nil
}
Expand Down
Loading