VOL-1247 : Modified change tuple to include previous and latest data
VOL-1214 : Fixed logs to use the proper mechanism
- Added missing license
- Moved one change tuple statement which would not include proper info
Change-Id: I5a02f6fe92c8b193642294d62f4413ac6edc0c62
diff --git a/db/model/merge.go b/db/model/merge.go
index e041e12..0546bd3 100644
--- a/db/model/merge.go
+++ b/db/model/merge.go
@@ -127,7 +127,7 @@
if field.IsContainer {
changes = append(
changes, ChangeTuple{POST_LISTCHANGE,
- NewOperationContext("", nil, fieldName, "")},
+ NewOperationContext("", nil, fieldName, ""), nil},
)
}
}
@@ -149,13 +149,13 @@
// FIXME: newRev may come back as nil... exclude those entries for now
if newRev != nil {
newList[idx] = newRev
- changes = append(changes, ChangeTuple{POST_ADD, newRev.GetData()})
+ changes = append(changes, ChangeTuple{POST_ADD, newList[idx].GetData(), newRev.GetData()})
}
}
for key, _ := range src.RemovedKeys {
oldRev := forkList[src.KeyMap1[key]]
revsToDiscard = append(revsToDiscard, oldRev)
- changes = append(changes, ChangeTuple{POST_REMOVE, oldRev.GetData()})
+ changes = append(changes, ChangeTuple{POST_REMOVE, oldRev.GetData(), nil})
}
for key, _ := range src.ChangedKeys {
idx := src.KeyMap2[key]
@@ -188,7 +188,7 @@
} else {
newRev := mergeChildFunc(srcList[src.KeyMap2[key]])
newList = append(newList, newRev)
- changes = append(changes, ChangeTuple{POST_ADD, newRev.GetData()})
+ changes = append(changes, ChangeTuple{POST_ADD, srcList[src.KeyMap2[key]], newRev.GetData()})
}
}
for key, _ := range src.ChangedKeys {
@@ -225,7 +225,7 @@
newList[len(newList)-1] = nil
newList = newList[:len(newList)-1]
- changes = append(changes, ChangeTuple{POST_REMOVE, oldRev.GetData()})
+ changes = append(changes, ChangeTuple{POST_REMOVE, oldRev.GetData(), nil})
}
}
@@ -251,7 +251,7 @@
rev = rev.UpdateAllChildren(newChildren, dstRev.GetBranch())
if configChanged {
- changes = append(changes, ChangeTuple{POST_UPDATE, rev.GetData()})
+ changes = append(changes, ChangeTuple{POST_UPDATE, dstRev.GetBranch().Latest.GetData(), rev.GetData()})
}
return rev, changes
} else {