Skip to content
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

Jump to bottom

server: reduce "growslice" in "dumpRowValuesBinary" #4916

Merged
merged 9 commits into from Nov 2, 2017
Merged

server: reduce "growslice" in "dumpRowValuesBinary" #4916

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f77b25
server: reduce "growslice" in "dumpRowValuesBinary"
zz-jason Oct 26, 2017
ceb3197
address comment
zz-jason Oct 27, 2017
569ee1d
address comment
zz-jason Oct 31, 2017
b77b569
Merge branch 'master' into dev/dumpRowValuesBinary
zz-jason Oct 31, 2017
fa3c61d
address comment
zz-jason Nov 2, 2017
5832ec5
address comment
zz-jason Nov 2, 2017
0bf130f
address comment
zz-jason Nov 2, 2017
0292c3e
Merge branch 'master' into dev/dumpRowValuesBinary
zz-jason Nov 2, 2017
a966f5e
Merge branch 'master' into dev/dumpRowValuesBinary
coocood Nov 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/util.go
View file
Open in desktop
Expand Up @@ -250,7 +250,6 @@ func dumpRowValuesBinary(alloc arena.Allocator, columns []*ColumnInfo, row []typ
err = mysql.ErrMalformPacket
return
}
data = append(data, mysql.OKHeader)
nullsLen := ((len(columns) + 7 + 2) / 8)
nulls := make([]byte, nullsLen)
for i, val := range row {
Expand All @@ -260,6 +259,8 @@ func dumpRowValuesBinary(alloc arena.Allocator, columns []*ColumnInfo, row []typ
nulls[bytePos] |= 1 << bitPos
}
}
data = make([]byte, 0, 1+nullsLen+8*len(row))
data = append(data, mysql.OKHeader)
data = append(data, nulls...)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about alloc data and nulls in one slice to avoid this operation?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea

for i, val := range row {
switch val.Kind() {
Expand Down