projects
/
users
/
andresfreund
/
postgres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
118fccd
)
bdr: document types of conflicts and their resolution (internals)
author
Andres Freund
<andres@anarazel.de>
Sun, 27 Apr 2014 11:14:44 +0000
(13:14 +0200)
committer
Andres Freund
<andres@anarazel.de>
Thu, 3 Jul 2014 15:55:27 +0000
(17:55 +0200)
contrib/bdr/conflicts.txt
[new file with mode: 0644]
patch
|
blob
diff --git a/contrib/bdr/conflicts.txt
b/contrib/bdr/conflicts.txt
new file mode 100644
(file)
index 0000000..
c57df4d
--- /dev/null
+++ b/
contrib/bdr/conflicts.txt
@@ -0,0
+1,15
@@
+type of conflict: UPDATE vs UPDATE
+detection: compare timestamp
+resolution: only apply later UPDATE
+
+type of conflict: INSERT vs INSERT
+detection: uniqueness violation
+resolution: convert INSERT into UPDATE, use UPDATE resolution
+
+type of conflict: UPDATE vs DELETE
+detection: primary key doesn't exist
+resolution: skip update, it's going to (or has been) deleted anyway
+
+type of conflict: DELETE vs DELETE
+detection: primary key doesn't exist
+resolution: skip