entity idents for reference mapping

1 files changed, 20 insertions, 14 deletions

diff --git a/lib/relation.ml b/lib/relation.ml
index 2f0c2a5..d6a1b70 100644
--- a/lib/relation.ml
+++ b/lib/relation.ml
@@ -53,33 +53,39 @@ let write_and_retrieve() =
   let open Disk in
   let stream: Executor.history = [{state = Executor._EMPTY_SHA_HASH_; files = Executor.StringMap.empty}] in
   let locations: Executor.locations = Executor.StringMap.empty in
+  let references = Executor.StringMap.empty in
+  let relation_name = "user" in
+  (* let entity_id, _ = Executor.StringMap.find relation_name references |> Executor.IntMap.max_binding in *)
+  let entity_id = 0L in
+  (* let references = 
+    Executor.StringMap.empty 
+    |> Executor.StringMap.add "user" (Executor.StringMap.empty
+                                      |> Executor.StringMap.add "entity_0" [handle11; handle12]
+                                      |> Executor.StringMap.add "entity_1" [handle21; handle22]
+                                      |> Executor.StringMap.add "entity_2" [handle31; handle32]) in *)
   let open Extensions.Result in
   let command_write1: Command.t =
     {kind = Command.WRITE; timestamp = 10.0; hash = ""; content = "Daisy"; filename = "user/first-name"} in
-  let+ ((stream, locations), Command.ComputedHash handle11) = Command.commit_and_perform stream locations Executor.StringMap.empty command_write1 in
+  let+ ((stream, locations, references), Command.ComputedHash handle11) = Command.commit_and_perform stream locations references ~entity_id command_write1 in
   let command_write2: Command.t =
     {kind = Command.WRITE; timestamp = 10.0; hash = ""; content = "Blossom"; filename = "user/last-name"} in
-  let+ ((stream, locations), Command.ComputedHash handle12) = Command.commit_and_perform stream locations Executor.StringMap.empty command_write2 in
+  let+ ((stream, locations, references), Command.ComputedHash handle12) = Command.commit_and_perform stream locations references ~entity_id command_write2 in
+  let entity_id = 1L in
   let command_write3: Command.t =
     {kind = Command.WRITE; timestamp = 10.0; hash = ""; content = "Minnie"; filename = "user/first-name"} in
-  let+ ((stream, locations), Command.ComputedHash handle21) = Command.commit_and_perform stream locations Executor.StringMap.empty command_write3 in
+  let+ ((stream, locations, references), Command.ComputedHash handle21) = Command.commit_and_perform stream locations references ~entity_id command_write3 in
   let command_write4: Command.t =
     {kind = Command.WRITE; timestamp = 10.0; hash = ""; content = "Mouse"; filename = "user/last-name"} in
-  let+ ((stream, locations), Command.ComputedHash handle22) = Command.commit_and_perform stream locations Executor.StringMap.empty command_write4 in
+  let+ ((stream, locations, references), Command.ComputedHash handle22) = Command.commit_and_perform stream locations references ~entity_id command_write4 in
+  let entity_id = 2L in
   let command_write5: Command.t =
     {kind = Command.WRITE; timestamp = 10.0; hash = ""; content = "Billie"; filename = "user/first-name"} in
-  let+ ((stream, locations), Command.ComputedHash handle31) = Command.commit_and_perform stream locations Executor.StringMap.empty command_write5 in
+  let+ ((stream, locations, references), Command.ComputedHash handle31) = Command.commit_and_perform stream locations references ~entity_id command_write5 in
   let command_write6: Command.t =
     {kind = Command.WRITE; timestamp = 10.0; hash = ""; content = "Beans"; filename = "user/last-name"} in
-  let+ ((stream, locations), Command.ComputedHash handle32) = Command.commit_and_perform stream locations Executor.StringMap.empty command_write6 in
-  let references = 
-    Executor.StringMap.empty 
-    |> Executor.StringMap.add "user" (Executor.StringMap.empty
-                                      |> Executor.StringMap.add "entity_0" [handle11; handle12]
-                                      |> Executor.StringMap.add "entity_1" [handle21; handle22]
-                                      |> Executor.StringMap.add "entity_2" [handle31; handle32]) in
+  let+ ((stream, locations, references), Command.ComputedHash handle32) = Command.commit_and_perform stream locations references ~entity_id command_write6 in
   let command_read: Command.t = {kind = Command.READ; timestamp = 0.0; hash = ""; content = ""; filename = "user"} in
-  let+ (_, (Command.Read content as response)) = Command.commit_and_perform (List.tl stream) locations references command_read in
+  let+ (_, (Command.Read content as response)) = Command.commit_and_perform (List.tl stream) locations references ~entity_id command_read in
   print_endline (Command.show_return response);
   Ok (stream, locations)
-    [@@warning "-8-27"] (* Suppress pattern match incomplete warnings *)
+    [@@warning "-8-27-26"] (* Suppress pattern match incomplete warnings *)