CA-171948: Add a parameter to allow the db add_to_map to be idempotent

Signed-off-by: Jon Ludlam <[email protected]>

Author: jonludlam

ocaml/database/db_cache_impl.ml

@@ -257,7 +257,7 @@ let process_structured_field_locked t (key,value) tblname fld objref proc_fn_sel
       | AddMap ->
         begin
           try
-            add_to_map key value existing_str
+            add_to_map false key value existing_str
           with Duplicate ->
             error "Duplicate key in set or map: table %s; field %s; ref %s; key %s" tblname fld objref key;
             raise (Duplicate_key (tblname,fld,objref,key));

ocaml/database/db_cache_types.ml

@@ -350,9 +350,9 @@ let remove_from_set key t =
   Schema.Value.Set (List.filter (fun x -> x <> key) t)
 
 exception Duplicate
-let add_to_map key value t =
+let add_to_map idempotent key value t =
   let t = Schema.Value.Unsafe_cast.pairs t in
-  if List.mem_assoc key t && List.assoc key t <> value then raise Duplicate;
+  if List.mem_assoc key t && (not idempotent || List.assoc key t <> value) then raise Duplicate;
   Schema.Value.Pairs ((key, value) :: List.filter (fun (k, _) -> k <> key) t)
 
 let remove_from_map key t =

ocaml/database/db_cache_types.mli

@@ -146,7 +146,7 @@ end
 exception Duplicate
 val add_to_set : string -> Schema.Value.t -> Schema.Value.t
 val remove_from_set : string -> Schema.Value.t -> Schema.Value.t
-val add_to_map : string -> string -> Schema.Value.t -> Schema.Value.t
+val add_to_map : bool -> string -> string -> Schema.Value.t -> Schema.Value.t
 val remove_from_map : string -> Schema.Value.t -> Schema.Value.t
 
 val set_field : string -> string -> string -> Schema.Value.t -> Database.t -> Database.t