Skip to content

fix: Disallow null character in strings per utf8 spec #797

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
merged 1 commit into from
Apr 19, 2023
Merged

fix: Disallow null character in strings per utf8 spec #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions schema/arrow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package schema

import (
"fmt"
"strings"

"github.com/goccy/go-json"

Expand Down Expand Up @@ -270,7 +271,9 @@ func CQTypesToRecord(mem memory.Allocator, c []CQTypes, arrowSchema *arrow.Schem
}
case TypeString:
if c[j][i].(*Text).Status == Present {
bldr.Field(i).(*array.StringBuilder).Append(c[j][i].(*Text).Str)
// In the new type system we wont allow null string as they are not valid utf-8
// https://github.com/apache/arrow/pull/35161#discussion_r1170516104
bldr.Field(i).(*array.StringBuilder).Append(strings.ReplaceAll(c[j][i].(*Text).Str, "\x00", ""))
} else {
bldr.Field(i).(*array.StringBuilder).AppendNull()
}
Expand All @@ -285,7 +288,7 @@ func CQTypesToRecord(mem memory.Allocator, c []CQTypes, arrowSchema *arrow.Schem
listBldr := bldr.Field(i).(*array.ListBuilder)
listBldr.Append(true)
for _, str := range c[j][i].(*TextArray).Elements {
listBldr.ValueBuilder().(*array.StringBuilder).Append(str.Str)
listBldr.ValueBuilder().(*array.StringBuilder).Append(strings.ReplaceAll(str.Str, "\x00", ""))
}
} else {
bldr.Field(i).(*array.ListBuilder).AppendNull()
Expand Down