candiduslynx commented on code in PR #35457:
URL: https://github.com/apache/arrow/pull/35457#discussion_r1187630328
##########
go/internal/types/extension_types.go:
##########
@@ -157,46 +147,47 @@ func (a UUIDArray) String() string {
}
switch {
case a.IsNull(i):
- o.WriteString("(null)")
+ o.WriteString(array.NullValueStr)
default:
- uuidStr, err := uuid.FromBytes(arr.Value(i))
- if err != nil {
- panic(fmt.Errorf("invalid uuid: %w", err))
- }
- fmt.Fprintf(o, "%q", uuidStr)
+ fmt.Fprintf(o, "%q", a.Value(i))
}
}
o.WriteString("]")
return o.String()
}
+func (a *UUIDArray) Value(i int) uuid.UUID {
+ if a.IsNull(i) {
+ return uuid.Nil
+ }
+ return
uuid.Must(uuid.FromBytes(a.Storage().(*array.FixedSizeBinary).Value(i)))
+}
+
+func (a *UUIDArray) ValueStr(i int) string {
+ switch {
+ case a.IsNull(i):
+ return array.NullValueStr
+ default:
+ return a.Value(i).String()
+ }
+}
+
func (a *UUIDArray) MarshalJSON() ([]byte, error) {
arr := a.Storage().(*array.FixedSizeBinary)
- vals := make([]interface{}, a.Len())
+ values := make([]interface{}, a.Len())
for i := 0; i < a.Len(); i++ {
if a.IsValid(i) {
- uuidStr, err := uuid.FromBytes(arr.Value(i))
- if err != nil {
- panic(fmt.Errorf("invalid uuid: %w", err))
- }
- vals[i] = uuidStr
- } else {
- vals[i] = nil
+ values[i] =
uuid.Must(uuid.FromBytes(arr.Value(i))).String()
}
}
- return json.Marshal(vals)
+ return json.Marshal(values)
}
func (a *UUIDArray) GetOneForMarshal(i int) interface{} {
- arr := a.Storage().(*array.FixedSizeBinary)
- if a.IsValid(i) {
- uuidObj, err := uuid.FromBytes(arr.Value(i))
- if err != nil {
- panic(fmt.Errorf("invalid uuid: %w", err))
- }
- return uuidObj
+ if a.IsNull(i) {
+ return nil
}
- return nil
+ return
uuid.Must(uuid.FromBytes(a.Storage().(*array.FixedSizeBinary).Value(i)))
Review Comment:
Done in 3e314138add5174886bb3c7c507d7ac0ae4f104b
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
