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

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

@ -1038,8 +1038,18 @@ 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)
}
// reify selector
var err error
out[i].selector, err = getDataSelector(spec.DataSelector)
if err != nil {
return nil, err
}
// find the pointed-at root node within the containing ds
var rsn ipld.Node var rsn ipld.Node
if strings.HasPrefix(string(*spec.DataSelector), "{") { if strings.HasPrefix(string(*spec.DataSelector), "{") {
@ -1054,9 +1064,7 @@ func parseDagSpec(ctx context.Context, root cid.Cid, dsp []api.DagSpec, ds forma
} }
var newRoot cid.Cid var newRoot cid.Cid
var errHalt = errors.New("halt walk") var errHalt = errors.New("halt walk")
if err := utils.TraverseDag( if err := utils.TraverseDag(
ctx, ctx,
ds, ds,
@ -1096,15 +1104,6 @@ func parseDagSpec(ctx context.Context, root cid.Cid, dsp []api.DagSpec, ds forma
out[i].root = newRoot out[i].root = newRoot
} }
if spec.DataSelector != nil {
var err error
out[i].selector, err = getDataSelector(spec.DataSelector)
if err != nil {
return nil, err
}
}
}
return out, nil return out, nil
} }