Skip to content

Always try to get the blob id/size from the metadata #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
butonic merged 1 commit into from
Mar 26, 2025
Merged

Always try to get the blob id/size from the metadata #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions pkg/storage/pkg/decomposedfs/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,32 @@ func ReadNode(ctx context.Context, lu PathLookup, spaceID, nodeID string, canLis
return nil, errtypes.InternalError("Missing parent ID on node")
}

if revisionSuffix == "" {
n.BlobID, n.Blobsize, err = lu.ReadBlobIDAndSizeAttr(ctx, n, attrs)
if err != nil {
return nil, err
}
} else {
versionNode := NewBaseNode(spaceID, nodeID+RevisionIDDelimiter+revisionSuffix, lu)
n.BlobID, n.Blobsize, err = lu.ReadBlobIDAndSizeAttr(ctx, versionNode, nil)
if err != nil {
return nil, err
if n.Type(ctx) == provider.ResourceType_RESOURCE_TYPE_FILE {
if revisionSuffix == "" {
var (
idOk, sizeOk bool
d []byte
err error
)

if d, idOk = attrs[prefixes.BlobIDAttr]; idOk {
n.BlobID = string(d)
}
if d, sizeOk = attrs[prefixes.BlobsizeAttr]; sizeOk {
n.Blobsize, err = strconv.ParseInt(string(d), 10, 64)
}
if err != nil || !idOk || !sizeOk {
n.BlobID, n.Blobsize, err = lu.ReadBlobIDAndSizeAttr(ctx, n, attrs)
if err != nil {
return nil, err
}
}
} else {
versionNode := NewBaseNode(spaceID, nodeID+RevisionIDDelimiter+revisionSuffix, lu)
n.BlobID, n.Blobsize, err = lu.ReadBlobIDAndSizeAttr(ctx, versionNode, nil)
if err != nil {
return nil, err
}
}
}

Expand Down