Index stable history trees during normalization
This commit is contained in:
@@ -95,12 +95,13 @@ func (builder *historyBuilder) observeInheritanceTransfer(payload historyPayload
|
||||
parentSide := unionInheritancePaths(beforePaths, parentPaths)
|
||||
parentRef := payload
|
||||
parentRef.substep = operationIndex * 2
|
||||
lookup := buildDocumentLookup(beforeChild, operation.parent)
|
||||
for _, path := range parentSide {
|
||||
if inheritanceOperationIdentity(operation, path) {
|
||||
continue
|
||||
}
|
||||
beforeNode, before := documentAtInheritancePath(beforeChild, transfer.to, path)
|
||||
parentNode, after := documentAtInheritancePath(operation.parent, transfer.to, path)
|
||||
beforeNode, before := documentAtInheritancePath(beforeChild, transfer.to, path, lookup)
|
||||
parentNode, after := documentAtInheritancePath(operation.parent, transfer.to, path, lookup)
|
||||
selection := selectInheritanceEvidence(resolveInheritanceAttribution(operation, path, inheritanceShapeFacts{
|
||||
child: before, parent: after,
|
||||
}), inheritanceEvidenceParent, inheritanceEvidenceDisplaced)
|
||||
@@ -123,12 +124,13 @@ func (builder *historyBuilder) observeInheritanceTransfer(payload historyPayload
|
||||
childSide := unionInheritancePaths(parentStatePaths, effectivePaths)
|
||||
childRef := payload
|
||||
childRef.substep = operationIndex*2 + 1
|
||||
lookup = buildDocumentLookup(parentState, operation.effective)
|
||||
for _, path := range childSide {
|
||||
if inheritanceOperationIdentity(operation, path) {
|
||||
continue
|
||||
}
|
||||
parentNode, before := documentAtInheritancePath(parentState, transfer.to, path)
|
||||
effectiveNode, after := documentAtInheritancePath(operation.effective, transfer.to, path)
|
||||
parentNode, before := documentAtInheritancePath(parentState, transfer.to, path, lookup)
|
||||
effectiveNode, after := documentAtInheritancePath(operation.effective, transfer.to, path, lookup)
|
||||
selection := selectInheritanceEvidence(resolveInheritanceAttribution(operation, path, inheritanceShapeFacts{
|
||||
parent: before, effective: after,
|
||||
}), inheritanceEvidenceChild, inheritanceEvidenceRemoval, inheritanceEvidenceDisplaced)
|
||||
@@ -203,12 +205,12 @@ func unionInheritancePaths(groups ...[]Path) []Path {
|
||||
return paths
|
||||
}
|
||||
|
||||
func documentAtInheritancePath(root *document.Node, rootPath, path Path) (*document.Node, bool) {
|
||||
func documentAtInheritancePath(root *document.Node, rootPath, path Path, lookup *documentLookup) (*document.Node, bool) {
|
||||
relative, within := relativeHistoryPath(rootPath, path)
|
||||
if !within {
|
||||
return nil, false
|
||||
}
|
||||
return documentAtPath(root, relative)
|
||||
return documentAtPathWithLookup(root, relative, lookup)
|
||||
}
|
||||
|
||||
func resolveInheritanceAttribution(operation inheritanceOperation, destination Path, shapes ...inheritanceShapeFacts) []inheritanceAttributionSelection {
|
||||
|
||||
Reference in New Issue
Block a user