Skip to content

Make readJson adhere to NoCopy #28

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

Open
semihbkgr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make readJson adhere to NoCopy #28

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
13 changes: 9 additions & 4 deletions wal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ func (l *Log) Read(index uint64) (data []byte, err error) {
epos := s.epos[index-s.index]
edata := s.ebuf[epos.pos:epos.end]
if l.opts.LogFormat == JSON {
return readJSON(edata)
return readJSON(edata, l.opts.NoCopy)
}
// binary read
size, n := binary.Uvarint(edata)
Expand All @@ -655,7 +655,7 @@ func (l *Log) Read(index uint64) (data []byte, err error) {
}

//go:noinline
func readJSON(edata []byte) ([]byte, error) {
func readJSON(edata []byte, noCopy bool) ([]byte, error) {
var data []byte
s := gjson.Get(*(*string)(unsafe.Pointer(&edata)), "data").String()
if len(s) > 0 && s[0] == '$' {
Expand All @@ -665,8 +665,13 @@ func readJSON(edata []byte) ([]byte, error) {
return nil, ErrCorrupt
}
} else if len(s) > 0 && s[0] == '+' {
data = make([]byte, len(s[1:]))
copy(data, s[1:])
d := s[1:]
if noCopy {
data = *(*[]byte)(unsafe.Pointer(&d))
} else {
data = make([]byte, len(d))
copy(data, d)
}
} else {
return nil, ErrCorrupt
}
Expand Down