From d192da14125f2cd1c153b97ea2cb0d2d8bbcdcfd Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 4 Mar 2020 10:59:10 -0800 Subject: [PATCH 1/2] fix: don't use private types in public functions --- car.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/car.go b/car.go index 326f94b2..d13f2cbc 100644 --- a/car.go +++ b/car.go @@ -105,12 +105,12 @@ func (cw *carWriter) writeNode(ctx context.Context, nd format.Node) error { return util.LdWrite(cw.w, nd.Cid().Bytes(), nd.RawData()) } -type carReader struct { +type CarReader struct { br *bufio.Reader Header *CarHeader } -func NewCarReader(r io.Reader) (*carReader, error) { +func NewCarReader(r io.Reader) (*CarReader, error) { br := bufio.NewReader(r) ch, err := ReadHeader(br) if err != nil { @@ -125,13 +125,13 @@ func NewCarReader(r io.Reader) (*carReader, error) { return nil, fmt.Errorf("invalid car version: %d", ch.Version) } - return &carReader{ + return &CarReader{ br: br, Header: ch, }, nil } -func (cr *carReader) Next() (blocks.Block, error) { +func (cr *CarReader) Next() (blocks.Block, error) { c, data, err := util.ReadNode(cr.br) if err != nil { return nil, err @@ -166,7 +166,7 @@ func LoadCar(s Store, r io.Reader) (*CarHeader, error) { return loadCarSlow(s, cr) } -func loadCarFast(s batchStore, cr *carReader) (*CarHeader, error) { +func loadCarFast(s batchStore, cr *CarReader) (*CarHeader, error) { var buf []blocks.Block for { blk, err := cr.Next() @@ -202,7 +202,7 @@ func loadCarFast(s batchStore, cr *carReader) (*CarHeader, error) { return cr.Header, nil } -func loadCarSlow(s Store, cr *carReader) (*CarHeader, error) { +func loadCarSlow(s Store, cr *CarReader) (*CarHeader, error) { for { blk, err := cr.Next() From 7ff5726c9e54af3067279729ef908265709503c8 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 4 Mar 2020 10:59:31 -0800 Subject: [PATCH 2/2] chore: remove dead code --- car.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/car.go b/car.go index d13f2cbc..f98779e9 100644 --- a/car.go +++ b/car.go @@ -192,14 +192,6 @@ func loadCarFast(s batchStore, cr *CarReader) (*CarHeader, error) { buf = buf[:0] } } - - if len(buf) > 0 { - if err := s.PutMany(buf); err != nil { - return nil, err - } - } - - return cr.Header, nil } func loadCarSlow(s Store, cr *CarReader) (*CarHeader, error) {