8000 interp: Add to binary fast path for arrays with only 0-255 numbers an… by wader · Pull Request #704 · wader/fq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

interp: Add to binary fast path for arrays with only 0-255 numbers an… #704

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
Jun 14, 2023
Merged

interp: Add to binary fast path for arrays with only 0-255 numbers an… #704

Show file tree
Hide file tree
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
44 changes: 43 additions & 1 deletion pkg/interp/binary.go
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ func ToBitReader(v any) (bitio.ReaderAtSeeker, error) {
return toBitReaderEx(v, false)
}

type byteRangeError int

func (b byteRangeError) Error() string {
return fmt.Sprintf("byte in binary list must be bytes (0-255) got %d", int(b))

}

func toBitReaderEx(v any, inArray bool) (bitio.ReaderAtSeeker, error) {
switch vv := v.(type) {
case ToBinary:
Expand All @@ -63,7 +70,7 @@ func toBitReaderEx(v any, inArray bool) (bitio.ReaderAtSeeker, error) {

if inArray {
if bi.Cmp(big.NewInt(255)) > 0 || bi.Cmp(big.NewInt(0)) < 0 {
return nil, fmt.Errorf("byte in binary list must be bytes (0-255) got %v", bi)
return nil, byteRangeError(bi.Int64())
}
n := bi.Uint64()
b := [1]byte{byte(n)}
Expand All @@ -86,6 +93,41 @@ func toBitReaderEx(v any, inArray bool) (bitio.ReaderAtSeeker, error) {
return br, nil
case []any:
rr := make([]bitio.ReadAtSeeker, 0, len(vv))

// fast path for slice containing only 0-255 numbers and strings
bs := &bytes.Buffer{}
for _, e := range vv {
if bs == nil {
break
}
switch ev := e.(type) {
case int:
if ev >= 0 && ev <= 255 {
bs.WriteByte(byte(ev))
continue
}
case float64:
b := int(ev)
if b >= 0 && b <= 255 {
bs.WriteByte(byte(ev))
continue
}
case *big.Int:
if ev.Cmp(big.NewInt(0)) >= 0 && ev.Cmp(big.NewInt(255)) <= 0 {
bs.WriteByte(byte(ev.Uint64()))
continue
}
case string:
// TODO: maybe only if less then some length?
bs.WriteString(ev)
continue
}
bs = nil
}
if bs != nil {
return bitio.NewBitReader(bs.Bytes(), -1), nil
}

// TODO: optimize byte array case, flatten into one slice
for _, e := range vv {
eBR, eErr := toBitReaderEx(e, true)
Expand Down
3 changes: 3 additions & 0 deletions pkg/interp/testdata/binary.fqtest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ mp3> [1, 2, 3, [1, 2, 3]] | tobytes
mp3> [1, 2, 3, [1, 2, 3], .headers[0].header.magic] | tobytes
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|
0x0|01 02 03 01 02 03 49 44 33| |......ID3| |.: raw bits 0x0-0x8.7 (9)
mp3> [0,"abc",1,2.1] | tobytes
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|
0x0|00 61 62 63 01 02| |.abc..| |.: raw bits 0x0-0x5.7 (6)
mp3> [-1] | tobytes
error: byte in binary list must be bytes (0-255) got -1
mp3> [256] | tobytes
Expand Down
0