cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #7688 from filecoin-project/chore/partret_cleanup_comment_and_flow

Browse Source 
Cleanup partial retrieval codepaths ( zero functional changes )
This commit is contained in:
Łukasz Magiera 2021-11-29 16:39:55 +01:00 committed by GitHub
commit 77d75b7739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/types.go
View File

@ -220,8 +220,10 @@ type ExportRef struct {
Root cid.Cid Root cid.Cid
// DAGs array specifies a list of DAGs to export // DAGs array specifies a list of DAGs to export
// - If exporting into a car file, defines car roots // - If exporting into unixfs files, only one DAG is supported, DataSelector is only used to find the targeted root node
// - If exporting into unixfs files, only one DAG is supported, DataSelector is only used to find the root node // - If exporting into a car file
// - When exactly one text-path DataSelector is specified exports the subgraph and its full merkle-path from the original root
// - Otherwise ( multiple paths and/or JSON selector specs) determines each individual subroot and exports the subtrees as a multi-root car
// - When not specified defaults to a single DAG: // - When not specified defaults to a single DAG:
// - Data - the entire DAG: `{"R":{"l":{"none":{}},":>":{"a":{">":{"@":{}}}}}}` // - Data - the entire DAG: `{"R":{"l":{"none":{}},":>":{"a":{">":{"@":{}}}}}}`
DAGs []DagSpec DAGs []DagSpec

107
node/impl/client/client.go
View File

@ -1038,71 +1038,70 @@ func parseDagSpec(ctx context.Context, root cid.Cid, dsp []api.DagSpec, ds forma
out := make([]dagSpec, len(dsp)) out := make([]dagSpec, len(dsp))
for i, spec := range dsp { for i, spec := range dsp {
// if a selector is specified, find it's root node if spec.DataSelector == nil {
if spec.DataSelector != nil { return nil, xerrors.Errorf("invalid DagSpec at position %d: `DataSelector` can not be nil", i)
var rsn ipld.Node }
if strings.HasPrefix(string(*spec.DataSelector), "{") { // reify selector
var err error var err error
rsn, err = selectorparse.ParseJSONSelector(string(*spec.DataSelector)) out[i].selector, err = getDataSelector(spec.DataSelector)
if err != nil { if err != nil {
return nil, xerrors.Errorf("failed to parse json-selector '%s': %w", *spec.DataSelector, err) return nil, err
} }
} else {
selspec, _ := textselector.SelectorSpecFromPath(textselector.Expression(*spec.DataSelector), nil) //nolint:errcheck // find the pointed-at root node within the containing ds
rsn = selspec.Node() var rsn ipld.Node
if strings.HasPrefix(string(*spec.DataSelector), "{") {
var err error
rsn, err = selectorparse.ParseJSONSelector(string(*spec.DataSelector))
if err != nil {
return nil, xerrors.Errorf("failed to parse json-selector '%s': %w", *spec.DataSelector, err)
} }
} else {
selspec, _ := textselector.SelectorSpecFromPath(textselector.Expression(*spec.DataSelector), nil) //nolint:errcheck
rsn = selspec.Node()
}
var newRoot cid.Cid var newRoot cid.Cid
var errHalt = errors.New("halt walk")
var errHalt = errors.New("halt walk") if err := utils.TraverseDag(
ctx,
if err := utils.TraverseDag( ds,
ctx, root,
ds, rsn,
root, func(p traversal.Progress, n ipld.Node, r traversal.VisitReason) error {
rsn, if r == traversal.VisitReason_SelectionMatch {
func(p traversal.Progress, n ipld.Node, r traversal.VisitReason) error { if rootOnNodeBoundary && p.LastBlock.Path.String() != p.Path.String() {
if r == traversal.VisitReason_SelectionMatch { return xerrors.Errorf("unsupported selection path '%s' does not correspond to a block boundary (a.k.a. CID link)", p.Path.String())
if rootOnNodeBoundary && p.LastBlock.Path.String() != p.Path.String() { }
return xerrors.Errorf("unsupported selection path '%s' does not correspond to a block boundary (a.k.a. CID link)", p.Path.String())
}
if p.LastBlock.Link == nil {
// this is likely the root node that we've matched here
newRoot = root
return errHalt
}
cidLnk, castOK := p.LastBlock.Link.(cidlink.Link)
if !castOK {
return xerrors.Errorf("cidlink cast unexpectedly failed on '%s'", p.LastBlock.Link)
}
newRoot = cidLnk.Cid
if p.LastBlock.Link == nil {
// this is likely the root node that we've matched here
newRoot = root
return errHalt return errHalt
} }
return nil
},
); err != nil && err != errHalt {
return nil, xerrors.Errorf("error while locating partial retrieval sub-root: %w", err)
}
if newRoot == cid.Undef { cidLnk, castOK := p.LastBlock.Link.(cidlink.Link)
return nil, xerrors.Errorf("path selection does not match a node within %s", root) if !castOK {
} return xerrors.Errorf("cidlink cast unexpectedly failed on '%s'", p.LastBlock.Link)
}
out[i].root = newRoot newRoot = cidLnk.Cid
return errHalt
}
return nil
},
); err != nil && err != errHalt {
return nil, xerrors.Errorf("error while locating partial retrieval sub-root: %w", err)
} }
if spec.DataSelector != nil { if newRoot == cid.Undef {
var err error return nil, xerrors.Errorf("path selection does not match a node within %s", root)
out[i].selector, err = getDataSelector(spec.DataSelector)
if err != nil {
return nil, err
}
} }
out[i].root = newRoot
} }
return out, nil return out, nil