Skip to content

db/etl: stop the bufio read benchmarks allocating per field #23618

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

Closed
AskAlexSharov wants to merge 1 commit into from
+14 −10
Closed

db/etl: stop the bufio read benchmarks allocating per field #23618

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
24 changes: 14 additions & 10 deletions db/etl/read_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,13 @@ func benchBufioU16(b *testing.B, fname string, bufSize int) {
defer f.Close()

r := bufio.NewReaderSize(f, bufSize)
lenBuf := make([]byte, 2)
var buf []byte
for {
if buf, err = readFieldBufioU16(r, buf); err != nil {
if buf, err = readFieldBufioU16(r, lenBuf, buf); err != nil {
break
}
if buf, err = readFieldBufioU16(r, buf); err != nil {
if buf, err = readFieldBufioU16(r, lenBuf, buf); err != nil {
break
}
}
Expand All @@ -224,20 +225,22 @@ func benchBufioU32(b *testing.B, fname string, bufSize int) {
defer f.Close()

r := bufio.NewReaderSize(f, bufSize)
lenBuf := make([]byte, 4)
var buf []byte
for {
if buf, err = readFieldBufioU32(r, buf); err != nil {
if buf, err = readFieldBufioU32(r, lenBuf, buf); err != nil {
break
}
if buf, err = readFieldBufioU32(r, buf); err != nil {
if buf, err = readFieldBufioU32(r, lenBuf, buf); err != nil {
break
}
}
}

func readFieldBufioU16(r *bufio.Reader, buf []byte) ([]byte, error) {
var lenBuf [2]byte
if _, err := io.ReadFull(r, lenBuf[:]); err != nil {
func readFieldBufioU16(r *bufio.Reader, lenBuf, buf []byte) ([]byte, error) {
// lenBuf comes from the caller: io.ReadFull takes an io.Reader, so a local
// array escapes and costs an allocation on every field read.
if _, err := io.ReadFull(r, lenBuf); err != nil {
return buf, err
}
n := int(*(*uint16)(unsafe.Pointer(&lenBuf[0])))
Expand All @@ -255,9 +258,10 @@ func readFieldBufioU16(r *bufio.Reader, buf []byte) ([]byte, error) {
return buf, nil
}

func readFieldBufioU32(r *bufio.Reader, buf []byte) ([]byte, error) {
var lenBuf [4]byte
if _, err := io.ReadFull(r, lenBuf[:]); err != nil {
func readFieldBufioU32(r *bufio.Reader, lenBuf, buf []byte) ([]byte, error) {
// lenBuf comes from the caller: io.ReadFull takes an io.Reader, so a local
// array escapes and costs an allocation on every field read.
if _, err := io.ReadFull(r, lenBuf); err != nil {
return buf, err
}
n := int(*(*uint32)(unsafe.Pointer(&lenBuf[0])))
Expand Down
Loading