bdr: conflict handling refactor phase 2
authorPetr Jelinek <pjmodos@pjmodos.net>
Thu, 13 Nov 2014 23:18:04 +0000 (00:18 +0100)
committerPetr Jelinek <pjmodos@pjmodos.net>
Thu, 13 Nov 2014 23:18:04 +0000 (00:18 +0100)
commit688771b4c0c3f1c43ce73e694f42c030ccfcbd6c
tree42da3a08a3268d6178fc4539ec69dc679058d2af
parentda4506392b67a8d7ec6cef3cff61e8c2c51ce7db
bdr: conflict handling refactor phase 2

New logging API has one unified function that creates Conflict object
which then can be used to log both into server log and to table.

Logging of all conflict types was unified under this new API.

Added two new conflict resolution types 'apply_change' and 'skip_change'
which are used in places where it's impossible to use conflict handlers
(like delete_delete conflict) and also in UDR instead of last update
wins.

In passing fix the timeframe handling of user defined conflict handlers.
bdr--0.8.0--0.8.0.1.sql
bdr.h
bdr_apply.c
bdr_conflict_handlers.c
bdr_conflict_logging.c
expected/isolation/dmlconflict_dd.out
expected/isolation/dmlconflict_ud.out