Normalize original resolution history evidence
This commit is contained in:
@@ -103,11 +103,9 @@ func addInspectionHistory(counter *retainedNodeCounter, inspection *Inspection)
|
||||
return false
|
||||
}
|
||||
}
|
||||
for _, snapshots := range [][]resolutionSnapshot{inspection.resolution, inspection.resolutionReplay} {
|
||||
for _, snapshot := range snapshots {
|
||||
if !counter.add(snapshot.before) || !counter.add(snapshot.after) {
|
||||
return false
|
||||
}
|
||||
for _, snapshot := range inspection.resolution {
|
||||
if !counter.add(snapshot.before) || !counter.add(snapshot.after) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
for _, operations := range [][]inheritanceOperation{inspection.inheritance, inspection.metadata.inheritance} {
|
||||
@@ -492,12 +490,12 @@ func mergeHistoryAtPath(root **document.Node, path Path, incoming *document.Node
|
||||
// Resolution records describe one before/final transformation, not assignment
|
||||
// order. A parent already carries its descendants' final values; merge overlapping
|
||||
// intent into that event rather than replay a child assignment a second time.
|
||||
func coalescedResolutionSnapshots(snapshots []resolutionSnapshot) []resolutionSnapshot {
|
||||
groups := make([]resolutionSnapshot, 0, len(snapshots))
|
||||
func coalescedResolutionSnapshots(snapshots []resolutionSnapshot) []resolutionReplayGroup {
|
||||
groups := make([]resolutionReplayGroup, 0, len(snapshots))
|
||||
reasons := make([]map[string]struct{}, 0, len(snapshots))
|
||||
dependencies := make([]map[string]struct{}, 0, len(snapshots))
|
||||
var coverage pathPrefixIndex
|
||||
for _, snapshot := range snapshots {
|
||||
for recordID, snapshot := range snapshots {
|
||||
pointer := snapshot.change.Path.String()
|
||||
groupIndex := -1
|
||||
coverage.visitAncestors(pointer, func(id int) {
|
||||
@@ -507,6 +505,7 @@ func coalescedResolutionSnapshots(snapshots []resolutionSnapshot) []resolutionSn
|
||||
})
|
||||
if groupIndex >= 0 {
|
||||
group := &groups[groupIndex]
|
||||
group.originalRecordIDs = append(group.originalRecordIDs, recordID)
|
||||
for _, reason := range snapshot.change.Reasons {
|
||||
if _, found := reasons[groupIndex][reason]; !found {
|
||||
reasons[groupIndex][reason] = struct{}{}
|
||||
@@ -525,15 +524,19 @@ func coalescedResolutionSnapshots(snapshots []resolutionSnapshot) []resolutionSn
|
||||
}
|
||||
continue
|
||||
}
|
||||
snapshot.change = cloneChange(snapshot.change)
|
||||
groups = append(groups, snapshot)
|
||||
reasonSet := make(map[string]struct{}, len(snapshot.change.Reasons))
|
||||
for _, reason := range snapshot.change.Reasons {
|
||||
change := cloneChange(snapshot.change)
|
||||
groups = append(groups, resolutionReplayGroup{
|
||||
originalRecordIDs: []int{recordID},
|
||||
coveringRecordID: recordID,
|
||||
change: change,
|
||||
})
|
||||
reasonSet := make(map[string]struct{}, len(change.Reasons))
|
||||
for _, reason := range change.Reasons {
|
||||
reasonSet[reason] = struct{}{}
|
||||
}
|
||||
reasons = append(reasons, reasonSet)
|
||||
dependencySet := make(map[string]struct{}, len(snapshot.change.Dependencies))
|
||||
for _, dependency := range snapshot.change.Dependencies {
|
||||
dependencySet := make(map[string]struct{}, len(change.Dependencies))
|
||||
for _, dependency := range change.Dependencies {
|
||||
dependencySet[dependency.String()] = struct{}{}
|
||||
}
|
||||
dependencies = append(dependencies, dependencySet)
|
||||
|
||||
Reference in New Issue
Block a user