From 037fbb24cd91e4804a8c66849f66592dbcbc007b Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 8 Jun 2026 07:35:30 +0000 Subject: object/fetch: Fix size types --- object/fetch/blob.go | 4 ++-- object/fetch/object.go | 7 +------ object/fetch/reader.go | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'object/fetch') diff --git a/object/fetch/blob.go b/object/fetch/blob.go index 199bede3..581fff90 100644 --- a/object/fetch/blob.go +++ b/object/fetch/blob.go @@ -32,7 +32,7 @@ func (fetcher *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], // together with its content size in bytes. // // Labels: Life-Parent, Close-Caller. -func (fetcher *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, int64, error) { +func (fetcher *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, uint64, error) { return fetcher.exactReader(id, typ.TypeBlob) } @@ -87,7 +87,7 @@ func (fetcher *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) { // together with its content size in bytes. // // Labels: Life-Parent, Close-Caller. -func (fetcher *Fetcher) PeelToBlobReader(id oid.ObjectID) (io.ReadCloser, int64, error) { +func (fetcher *Fetcher) PeelToBlobReader(id oid.ObjectID) (io.ReadCloser, uint64, error) { blobID, err := fetcher.PeelToBlobID(id) if err != nil { return nil, 0, err diff --git a/object/fetch/object.go b/object/fetch/object.go index 4c999871..5dbb84ab 100644 --- a/object/fetch/object.go +++ b/object/fetch/object.go @@ -29,12 +29,7 @@ func (fetcher *Fetcher) parseObject(id oid.ObjectID) (object.Object, error) { parsed, err := object.ParseWithoutHeader(ty, content, id.ObjectFormat()) if err != nil { - tyName, ok := ty.Name() - if !ok { - tyName = fmt.Sprintf("type %d", ty) - } - - return nil, fmt.Errorf("object/fetch: parse object %s (%s): %w", id, tyName, err) + return nil, fmt.Errorf("object/fetch: parse object %s (%s): %w", id, ty.Name(), err) } return parsed, nil diff --git a/object/fetch/reader.go b/object/fetch/reader.go index 5503246a..8baf1119 100644 --- a/object/fetch/reader.go +++ b/object/fetch/reader.go @@ -10,7 +10,7 @@ import ( // exactReader reads one object's content stream // and verifies that its header type matches wantType. -func (fetcher *Fetcher) exactReader(id oid.ObjectID, wantType typ.Type) (io.ReadCloser, int64, error) { +func (fetcher *Fetcher) exactReader(id oid.ObjectID, wantType typ.Type) (io.ReadCloser, uint64, error) { gotType, size, rc, err := fetcher.store.ReadReaderContent(id) if err != nil { return nil, 0, wrapObjectReadError(id, err) -- cgit v1.3.1-10-gc9f91