commit 23599af04ea7b5e96c4444426acf692348794308
author Paul J. Davis <paul.joseph.davis@gmail.com> Wed Sep 02 15:34:48 2020 -0500
committer GitHub <noreply@github.com> Wed Sep 02 15:34:48 2020 -0500
tree 2a2fc733b15f2f3b830978882514ecffe28fdd76
parent 579e066c1402f41c7260631125f117b4dcdabf93
parent 9147f052c1713c5e5288d18555adfc624f20d45d

Merge pull request #10 from apache/report-conflicting-keys

Add support for reporting conflicting keys

c_src/atom_names.h

diff --git a/c_src/atom_names.h b/c_src/atom_names.h
index 0a6b1ad..98b5c4f 100644
--- a/c_src/atom_names.h
+++ b/c_src/atom_names.h
@@ -107,6 +107,7 @@
 ATOM_MAP(disallow_writes);
 ATOM_MAP(include_port_in_address);
 ATOM_MAP(use_provisional_proxies);
+ATOM_MAP(report_conflicting_keys);
 
 
 // Streaming mode

c_src/main.c

diff --git a/c_src/main.c b/c_src/main.c
index b693f06..b1db949 100644
--- a/c_src/main.c
+++ b/c_src/main.c
@@ -946,6 +946,10 @@
         option = FDB_TR_OPTION_SIZE_LIMIT;
     } else if(IS_ATOM(argv[1], use_provisional_proxies)) {
         option = FDB_TR_OPTION_USE_PROVISIONAL_PROXIES;
+#if FDB_API_VERSION > 620
+    } else if(IS_ATOM(argv[1], report_conflicting_keys)) {
+        option = FDB_TR_OPTION_REPORT_CONFLICTING_KEYS;
+#endif
     } else {
         return enif_make_badarg(env);
     }

src/erlfdb.erl

diff --git a/src/erlfdb.erl b/src/erlfdb.erl
index 240925f..56ea4f7 100644
--- a/src/erlfdb.erl
+++ b/src/erlfdb.erl
@@ -115,6 +115,9 @@
     % Locality
     get_addresses_for_key/2,
 
+    % Get conflict information
+    get_conflicting_keys/1,
+
     % Misc
     on_error/2,
     error_predicate/2,
@@ -629,6 +632,12 @@
     get_addresses_for_key(?GET_TX(SS), Key).
 
 
+get_conflicting_keys(?IS_TX = Tx) ->
+    StartKey = <<16#FF, 16#FF, "/transaction/conflicting_keys/">>,
+    EndKey = <<16#FF, 16#FF, "/transaction/conflicting_keys/", 16#FF>>,
+    get_range(Tx, StartKey, EndKey).
+
+
 on_error(?IS_TX = Tx, {erlfdb_error, ErrorCode}) ->
     on_error(Tx, ErrorCode);