Remove the rac.ReaderContext type

This commit is contained in:
Nigel Tao committed 2019-09-15 10:16:59 +10:00
1 parent 65e7b2b6c9
commit cde91019d9
5 files changed
+47 -69

No files matched your search

+9 -7
View File
@@ -40,6 +40,7 @@ var (
type CodecReader struct {
cachedReader compression.Reader
recycler cgozstd.ReaderRecycler
lim io.LimitedReader
}
// Close implements rac.CodecReader.
@@ -58,23 +59,24 @@ func (r *CodecReader) Clone() rac.CodecReader {
}
// MakeDecompressor implements rac.CodecReader.
func (r *CodecReader) MakeDecompressor(compressed io.Reader, rctx rac.ReaderContext) (io.Reader, error) {
func (r *CodecReader) MakeDecompressor(racFile io.ReadSeeker, chunk rac.Chunk) (io.Reader, error) {
if _, err := racFile.Seek(chunk.CPrimary[0], io.SeekStart); err != nil {
return nil, err
}
r.lim.R = racFile
r.lim.N = chunk.CPrimary.Size()
if r.cachedReader == nil {
zr := &cgozstd.Reader{}
r.cachedReader = zr
r.recycler.Bind(zr)
}
if err := r.cachedReader.Reset(compressed, rctx.Secondary); err != nil {
if err := r.cachedReader.Reset(&r.lim, nil); err != nil {
return nil, err
}
return r.cachedReader, nil
}
// MakeReaderContext implements rac.CodecReader.
func (r *CodecReader) MakeReaderContext(rs io.ReadSeeker, chunk rac.Chunk) (rac.ReaderContext, error) {
return rac.ReaderContext{}, nil
}
// CodecWriter specializes a rac.Writer to encode Zstd-compressed chunks.
type CodecWriter struct {
compressed bytes.Buffer