able to get chunk Index from Index, fix writer #3
Conversation
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
wangkuiyi
reviewed
May 24, 2017
chunk.go
Outdated
| @@ -76,9 +76,17 @@ func (ch *Chunk) dump(w io.Writer, compressorIndex int) error { | |||
| return nil | |||
| } | |||
|
|
|||
| type dummyCloser struct { | |||
There was a problem hiding this comment.
dummyCloser ==> noopCompressor ?
chunk.go
Outdated
| func compressData(src io.Reader, compressorIndex int) (*bytes.Buffer, error) { | ||
| compressed := new(bytes.Buffer) |
There was a problem hiding this comment.
I think the function should be somehow like the following:
func compressData(src io.Reader, compressorIndex int) (*bytes.Buffer, error) {
var compressed bytes.Buffer
var compressor io.WriteCloser
switch compressorIndex {
case NoCompression:
compressor = &noopCompressor{compressed}
case Snappy:
compressor = snappy.NewBufferedWriter(compressed)
case Gzip:
compressor = gzip.NewWriter(compressed)
default:
return nil, fmt.Errorf("Unknown compression algorithm: %d", compressorIndex)
}
defer compressor.Close()
if _, e := io.Copy(compressor, src); e != nil {
return nil, fmt.Errorf("Failed to compress chunk data: %v", e)
}
return &compressed, nil
}The point is that compressed is still of type bytes.Buffer, and we just create a noopCompressor which works like snappy.Writer and gzip.Writer.
There was a problem hiding this comment.
Much better, thanks! Done.
header.go
Outdated
| @@ -21,6 +19,11 @@ const ( | |||
| Gzip | |||
| ) | |||
|
|
|||
| const ( | |||
There was a problem hiding this comment.
Can we merge this const group with the previous one?
reader.go
Outdated
| @@ -19,11 +23,15 @@ func LoadIndex(r io.ReadSeeker) (*Index, error) { | |||
| for { | |||
| hdr, e = parseHeader(r) | |||
| if e != nil { | |||
| if e != io.EOF { | |||
| fmt.Println("parse err:", e) | |||
There was a problem hiding this comment.
Is this snippet for debugging? Should we remove it?
writer.go
Outdated
| maxChunkSize = defaultMaxChunkSize | ||
| } | ||
|
|
||
| if compressor == -1 { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.