-
-
Notifications
You must be signed in to change notification settings - Fork 180
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.
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
use bufio.Writer instead of binary.Write to reduce memory footprint while serializing #103
Merged
lemire
merged 2 commits into
bits-and-blooms:master
from
thanhpk:reduce-memory-usage-while-serializing
Mar 18, 2022
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -895,8 +895,22 @@ func (b *BitSet) WriteTo(stream io.Writer) (int64, error) { | |
} | ||
|
||
// Write set | ||
err = binary.Write(stream, binaryOrder, b.set) | ||
return int64(b.BinaryStorageSize()), err | ||
// current implementation of bufio.Writer is more memory efficient than | ||
// binary.Write for large set | ||
writer := bufio.NewWriter(stream) | ||
var item = make([]byte, 8) // for serializing uint64 | ||
var n = binary.Size(uint64(0)) // number of bytes written | ||
for _, x := range b.set { | ||
binaryOrder.PutUint64(item, x) | ||
nn, err := writer.Write(item) | ||
if err != nil { | ||
return int64(n+nn), err | ||
} | ||
n += nn | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why would you do all of these additions? |
||
} | ||
|
||
err = writer.Flush() | ||
return int64(n), err | ||
} | ||
|
||
// ReadFrom reads a BitSet from a stream written using WriteTo | ||
|
@@ -915,9 +929,20 @@ func (b *BitSet) ReadFrom(stream io.Reader) (int64, error) { | |
} | ||
|
||
// Read remaining bytes as set | ||
err = binary.Read(stream, binaryOrder, newset.set) | ||
if err != nil { | ||
return 0, err | ||
// current implementation bufio.Reader is more memory efficient than | ||
// binary.Read for large set | ||
reader := bufio.NewReader(stream) | ||
i := 0 | ||
var item = make([]byte, 8) // one uint64 | ||
for { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not go with the standard...
|
||
if _, err := reader.Read(item); err != nil { | ||
if err == io.EOF { | ||
break // done | ||
} | ||
return 0, err | ||
} | ||
newset.set[i] = binaryOrder.Uint64(item) | ||
i++ | ||
} | ||
|
||
*b = *newset | ||
|
@@ -927,25 +952,18 @@ func (b *BitSet) ReadFrom(stream io.Reader) (int64, error) { | |
// MarshalBinary encodes a BitSet into a binary form and returns the result. | ||
func (b *BitSet) MarshalBinary() ([]byte, error) { | ||
var buf bytes.Buffer | ||
writer := bufio.NewWriter(&buf) | ||
|
||
_, err := b.WriteTo(writer) | ||
_, err := b.WriteTo(&buf) | ||
if err != nil { | ||
return []byte{}, err | ||
} | ||
|
||
err = writer.Flush() | ||
|
||
return buf.Bytes(), err | ||
} | ||
|
||
// UnmarshalBinary decodes the binary form generated by MarshalBinary. | ||
func (b *BitSet) UnmarshalBinary(data []byte) error { | ||
buf := bytes.NewReader(data) | ||
reader := bufio.NewReader(buf) | ||
|
||
_, err := b.ReadFrom(reader) | ||
|
||
_, err := b.ReadFrom(buf) | ||
return err | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That seems odd, doesn't it? You assume that the size is 8, and then you next compute it? Do I get this right?