Tweak raczlib to be consistent with raczstd

This commit is contained in:
Nigel Tao committed 2019-09-14 12:57:46 +10:00
1 parent 3a3d9a3ca8
commit badbcc2be8
3 files changed
+19 -17

No files matched your search

+4 -4
View File
@@ -25,11 +25,11 @@ import (
// MakeDecompressor implements rac.CodecReader.
func (r *CodecReader) MakeDecompressor(compressed io.Reader, rctx rac.ReaderContext) (io.Reader, error) {
if r.cachedZlibReader == nil {
r.cachedZlibReader = &cgozlib.Reader{}
if r.cachedReader == nil {
r.cachedReader = &cgozlib.Reader{}
}
if err := r.cachedZlibReader.Reset(compressed, rctx.Secondary); err != nil {
if err := r.cachedReader.Reset(compressed, rctx.Secondary); err != nil {
return nil, err
}
return r.cachedZlibReader, nil
return r.cachedReader, nil
}
+4 -4
View File
@@ -26,17 +26,17 @@ import (
// MakeDecompressor implements rac.CodecReader.
func (r *CodecReader) MakeDecompressor(compressed io.Reader, rctx rac.ReaderContext) (io.Reader, error) {
if r.cachedZlibReader != nil {
if err := r.cachedZlibReader.Reset(compressed, rctx.Secondary); err != nil {
if r.cachedReader != nil {
if err := r.cachedReader.Reset(compressed, rctx.Secondary); err != nil {
return nil, err
}
return r.cachedZlibReader, nil
return r.cachedReader, nil
}
zlibReader, err := zlib.NewReaderDict(compressed, rctx.Secondary)
if err != nil {
return nil, err
}
r.cachedZlibReader = zlibReader.(compression.Reader)
r.cachedReader = zlibReader.(compression.Reader)
return zlibReader, nil
}
+11 -9
View File
@@ -57,9 +57,9 @@ func suffix32K(b []byte) []byte {
// CodecReader specializes a rac.Reader to decode Zlib-compressed chunks.
type CodecReader struct {
// cachedZlibReader lets us re-use the memory allocated for a zlib reader,
// when decompressing multiple chunks.
cachedZlibReader compression.Reader
// cachedReader lets us re-use the memory allocated for a zlib reader, when
// decompressing multiple chunks.
cachedReader compression.Reader
// These fields contain the most recently used shared dictionary.
cachedDictionary []byte
@@ -153,9 +153,9 @@ func (r *CodecReader) MakeReaderContext(rs io.ReadSeeker, chunk rac.Chunk) (rac.
type CodecWriter struct {
// These fields help reduce memory allocation by re-using previous byte
// buffers or the zlib.Writer.
compressed bytes.Buffer
zlibWriter *zlib.Writer
stash []byte
compressed bytes.Buffer
cachedWriter *zlib.Writer
stash []byte
}
// Close implements rac.CodecWriter.
@@ -228,24 +228,26 @@ func (w *CodecWriter) compress(p []byte, q []byte, dict []byte) ([]byte, error)
if err != nil {
return nil, err
}
} else if w.zlibWriter == nil {
} else if w.cachedWriter == nil {
zw, err = zlib.NewWriterLevelDict(&w.compressed, zlib.BestCompression, nil)
if err != nil {
return nil, err
}
w.zlibWriter = zw
w.cachedWriter = zw
} else {
zw = w.zlibWriter
zw = w.cachedWriter
zw.Reset(&w.compressed)
}
if len(p) > 0 {
if _, err := zw.Write(p); err != nil {
zw.Close()
return nil, err
}
}
if len(q) > 0 {
if _, err := zw.Write(q); err != nil {
zw.Close()
return nil, err
}
}