DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Move ref. resolve at the very end of page imp.

Browse Source
This commit is contained in:
Denis Arh 2019-09-30 11:39:51 +02:00
parent 262d01f7af
commit 8302bdbff4
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
compose/importer/page.go
View File

@ -265,8 +265,28 @@ func (pImp *Page) Get(handle string) (*types.Page, error) {
return pImp.set.FindByHandle(handle), nil
}
func (pImp *Page) Store(ctx context.Context, k pageKeeper) error {
return pImp.storeChildren(ctx, "", k)
func (pImp *Page) Store(ctx context.Context, k pageKeeper) (err error) {
if err = pImp.storeChildren(ctx, "", k); err != nil {
return
}
// We do that at the end - and save all pages with resolved references
//
// Many because internal page referencing from page blocks
var refs uint
for _, page := range pImp.set {
if refs, err = pImp.resolveRefs(page); err != nil {
return
} else if refs > 0 {
// make sure we do not get stale-data error
page.UpdatedAt = nil
if _, err = k.Update(page); err != nil {
return errors.Wrap(err, "could not update resolved refs")
}
}
}
return
}
func (pImp *Page) storeChildren(ctx context.Context, parent string, k pageKeeper) (err error) {
@ -322,26 +342,6 @@ func (pImp *Page) storeChildren(ctx context.Context, parent string, k pageKeeper
}
}
// We do that at the end - and save all pages with resolved references
//
// Many because internal page referencing from page blocks
var refs uint
for _, child := range children {
if page, err = pImp.Get(child); err != nil {
return
}
if refs, err = pImp.resolveRefs(page); err != nil {
return
} else if refs > 0 {
// make sure we do not get stale-data error
page.UpdatedAt = nil
if _, err = k.Update(page); err != nil {
return errors.Wrap(err, "could not update resolved refs")
}
}
}
return
}