From 08798669eb31838a401bf4a020083c58cb7c44d2 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 9 Aug 2019 15:31:03 +1000 Subject: [PATCH] Remove unnecessary rac CompressedSize field --- cmd/ractool/main.go | 11 +--------- lib/rac/example_test.go | 3 +-- lib/rac/parser.go | 41 +++++++++++++++++++++++-------------- lib/rac/rac_test.go | 9 +++----- lib/rac/reader.go | 18 +++++++++------- lib/raczlib/example_test.go | 5 ++--- lib/raczlib/raczlib_test.go | 10 ++++----- 7 files changed, 48 insertions(+), 49 deletions(-) diff --git a/cmd/ractool/main.go b/cmd/ractool/main.go index c20a92d1..51e88f22 100644 --- a/cmd/ractool/main.go +++ b/cmd/ractool/main.go @@ -244,17 +244,8 @@ func decode(r io.Reader, usingStdin bool) error { } } - compressedSize, err := rs.Seek(0, io.SeekEnd) - if err != nil { - return err - } - if _, err := rs.Seek(0, io.SeekStart); err != nil { - return err - } - racReader := &rac.Reader{ - ReadSeeker: rs, - CompressedSize: compressedSize, + ReadSeeker: rs, } switch *codecFlag { case "zlib": diff --git a/lib/rac/example_test.go b/lib/rac/example_test.go index b46cc167..b2627248 100644 --- a/lib/rac/example_test.go +++ b/lib/rac/example_test.go @@ -160,8 +160,7 @@ func Example_indexLocationAtStart() { fmt.Printf("Decoded:\n") p := &rac.Parser{ - ReadSeeker: bytes.NewReader(encoded), - CompressedSize: int64(len(encoded)), + ReadSeeker: bytes.NewReader(encoded), } zr := io.ReadCloser(nil) for { diff --git a/lib/rac/parser.go b/lib/rac/parser.go index 32c8bc7e..8625d63a 100644 --- a/lib/rac/parser.go +++ b/lib/rac/parser.go @@ -254,11 +254,6 @@ type Parser struct { // Nil is an invalid value. ReadSeeker io.ReadSeeker - // CompressedSize is the size of the RAC file. - // - // Zero is an invalid value, as an empty file is not a valid RAC file. - CompressedSize int64 - // initialized is set true after the first call on this Parser. initialized bool @@ -273,6 +268,9 @@ type Parser struct { // occurs, all public methods will return that error. err error + // compressedSize is the size of the RAC file in CSpace. + compressedSize int64 + // decompressedSize is the size of the RAC file in DSpace. decompressedSize int64 @@ -302,10 +300,6 @@ func (r *Parser) checkParameters() error { r.err = errInvalidReadSeeker return r.err } - if r.CompressedSize < 32 { - r.err = errInvalidCompressedSize - return r.err - } return nil } @@ -322,6 +316,23 @@ func (r *Parser) initialize() error { return err } + if r.compressedSize == 0 { + if size, err := r.ReadSeeker.Seek(0, io.SeekEnd); err != nil { + r.err = err + return r.err + } else { + r.compressedSize = size + } + if _, err := r.ReadSeeker.Seek(0, io.SeekStart); err != nil { + r.err = err + return r.err + } + } + if r.compressedSize < 32 { + r.err = errInvalidCompressedSize + return r.err + } + if err := r.findRootNode(); err != nil { return err } @@ -351,7 +362,7 @@ func (r *Parser) findRootNode() error { } // Look at the end of the compressed file. - if err := readAt(r.ReadSeeker, r.currNode[:1], r.CompressedSize-1); err != nil { + if err := readAt(r.ReadSeeker, r.currNode[:1], r.compressedSize-1); err != nil { r.err = err return r.err } @@ -369,12 +380,12 @@ func (r *Parser) tryRootNode(arity uint8, fromEnd bool) (found bool, ioErr error return false, nil } size := int64(nodeSize(arity)) - if r.CompressedSize < size { + if r.compressedSize < size { return false, nil } cOffset := int64(0) if fromEnd { - cOffset = r.CompressedSize - size + cOffset = r.compressedSize - size } if err := r.load(cOffset, arity); err != nil { return false, err @@ -382,7 +393,7 @@ func (r *Parser) tryRootNode(arity uint8, fromEnd bool) (found bool, ioErr error if !r.currNode.valid() { return false, nil } - if r.currNode.cPtrMax() != r.CompressedSize { + if r.currNode.cPtrMax() != r.compressedSize { return false, nil } r.needToResolveSeekPosition = true @@ -412,7 +423,7 @@ func (r *Parser) loadAndValidate(cOffset int64, parentCodec Codec, parentVersion uint8, parentCOffMax int64, childCBias int64, childDSize int64) error { - if (cOffset < 0) || ((r.CompressedSize - 4) < cOffset) { + if (cOffset < 0) || ((r.compressedSize - 4) < cOffset) { r.err = errInvalidIndexNode return r.err } @@ -426,7 +437,7 @@ func (r *Parser) loadAndValidate(cOffset int64, return r.err } size := int64(nodeSize(arity)) - if (r.CompressedSize < size) || ((r.CompressedSize - size) < cOffset) { + if (r.compressedSize < size) || ((r.compressedSize - size) < cOffset) { r.err = errInvalidIndexNode return r.err } diff --git a/lib/rac/rac_test.go b/lib/rac/rac_test.go index c065c4ec..265f7818 100644 --- a/lib/rac/rac_test.go +++ b/lib/rac/rac_test.go @@ -350,8 +350,7 @@ func TestMultiLevelIndex(t *testing.T) { } p := &Parser{ - ReadSeeker: bytes.NewReader(encoded), - CompressedSize: int64(len(encoded)), + ReadSeeker: bytes.NewReader(encoded), } gotPrimaries := []byte(nil) for { @@ -403,8 +402,7 @@ loop: encoded := buf.Bytes() p := &Parser{ - ReadSeeker: bytes.NewReader(encoded), - CompressedSize: int64(len(encoded)), + ReadSeeker: bytes.NewReader(encoded), } for n := 0; ; n++ { if _, err := p.NextChunk(); err == io.EOF { @@ -476,8 +474,7 @@ loop: } p := &Parser{ - ReadSeeker: bytes.NewReader(tc.compressed), - CompressedSize: int64(len(tc.compressed)), + ReadSeeker: bytes.NewReader(tc.compressed), } if gotDecompressedSize, err := p.DecompressedSize(); err != nil { diff --git a/lib/rac/reader.go b/lib/rac/reader.go index d5ac54d7..2f9672a7 100644 --- a/lib/rac/reader.go +++ b/lib/rac/reader.go @@ -62,11 +62,6 @@ type Reader struct { // Nil is an invalid value. ReadSeeker io.ReadSeeker - // CompressedSize is the size of the RAC file. - // - // Zero is an invalid value, as an empty file is not a valid RAC file. - CompressedSize int64 - // CodecReaders are the compression codecs that this Reader can decompress. // // For example, use a raczlib.CodecReader from the sibilng "raczlib" @@ -144,9 +139,18 @@ func (r *Reader) initialize() error { r.err = errInvalidReadSeeker return r.err } + if size, err := r.ReadSeeker.Seek(0, io.SeekEnd); err != nil { + r.err = err + return r.err + } else { + r.parser.compressedSize = size + } + if _, err := r.ReadSeeker.Seek(0, io.SeekStart); err != nil { + r.err = err + return r.err + } r.parser.ReadSeeker = r.ReadSeeker - r.parser.CompressedSize = r.CompressedSize r.currChunk.R = r.ReadSeeker return nil } @@ -316,7 +320,7 @@ func (r *Reader) nextChunk() error { return r.err } - rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.CompressedSize, chunk) + rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.parser.compressedSize, chunk) if err != nil { if err == io.EOF { err = io.ErrUnexpectedEOF diff --git a/lib/raczlib/example_test.go b/lib/raczlib/example_test.go index c33fc1f5..6b8f88d6 100644 --- a/lib/raczlib/example_test.go +++ b/lib/raczlib/example_test.go @@ -71,9 +71,8 @@ func Example_roundTrip() { // Prepare to decompress. r := &rac.Reader{ - ReadSeeker: bytes.NewReader(compressed), - CompressedSize: int64(len(compressed)), - CodecReaders: []rac.CodecReader{&raczlib.CodecReader{}}, + ReadSeeker: bytes.NewReader(compressed), + CodecReaders: []rac.CodecReader{&raczlib.CodecReader{}}, } // Read the whole file. diff --git a/lib/raczlib/raczlib_test.go b/lib/raczlib/raczlib_test.go index c557f10f..e62b21b4 100644 --- a/lib/raczlib/raczlib_test.go +++ b/lib/raczlib/raczlib_test.go @@ -77,9 +77,8 @@ func racCompress(original []byte, cChunkSize uint64, dChunkSize uint64, resource func racDecompress(compressed []byte) ([]byte, error) { buf := &bytes.Buffer{} r := &rac.Reader{ - ReadSeeker: bytes.NewReader(compressed), - CompressedSize: int64(len(compressed)), - CodecReaders: []rac.CodecReader{&CodecReader{}}, + ReadSeeker: bytes.NewReader(compressed), + CodecReaders: []rac.CodecReader{&CodecReader{}}, } if _, err := io.Copy(buf, r); err != nil { return nil, err @@ -197,9 +196,8 @@ func TestZeroedBytes(t *testing.T) { } r := &rac.Reader{ - ReadSeeker: bytes.NewReader(compressed), - CompressedSize: int64(len(compressed)), - CodecReaders: []rac.CodecReader{&CodecReader{}}, + ReadSeeker: bytes.NewReader(compressed), + CodecReaders: []rac.CodecReader{&CodecReader{}}, } for j := 0; j <= len(original); j++ { want := original[j:]