diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/disk.ml | 8 | ||||
| -rw-r--r-- | lib/relation.ml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/disk.ml b/lib/disk.ml index c28e07f..cfa2a89 100644 --- a/lib/disk.ml +++ b/lib/disk.ml @@ -406,7 +406,7 @@ module Command = struct type return = | ComputedHash of string - | Read of (int64 * Executor.relational_literal list) list + | Read of (int64 * (string*Executor.relational_literal) list) list | Nothing [@@deriving show] @@ -432,7 +432,7 @@ module Command = struct let references: Executor.references = let relation_name::[attribute_name] = String.split_on_char '/' command.attribute - in + [@@warning "-8"] in Executor.StringMap.update relation_name (function | Some entity -> @@ -468,13 +468,13 @@ module Command = struct | None -> Executor.IntMap.empty in - let content = + let content: (int64 * (string*Executor.relational_literal) list) list = Executor.IntMap.fold (fun key elems acc -> (key, List.map (fun (location, type', attribute_name) -> - Executor.read_location ~hash:location locations type') + (attribute_name, Executor.read_location ~hash:location locations type')) elems) :: acc) entities [] diff --git a/lib/relation.ml b/lib/relation.ml index 27cc723..a43ae1d 100644 --- a/lib/relation.ml +++ b/lib/relation.ml @@ -1,11 +1,11 @@ -let print_references (references: (string * Disk.Executor.relational_type) list Disk.Executor.IntMap.t Disk.Executor.StringMap.t) = +let print_references (references: (string * Disk.Executor.relational_type * string) list Disk.Executor.IntMap.t Disk.Executor.StringMap.t) = Disk.Executor.StringMap.iter (fun k v -> print_endline ("→ " ^ k ^ ": "); Disk.Executor.IntMap.iter (fun k v -> print_endline (" ↳ " ^ Int64.to_string k); - List.iter (fun (v, type') -> print_endline (" → " ^ v ^ "[" ^ Disk.Executor.show_relational_type type' ^ "]")) v) + List.iter (fun (v, type', name) -> print_endline (" → " ^ v ^ "[" ^ name ^ "::" ^ Disk.Executor.show_relational_type type' ^ "]")) v) v; print_newline ()) references |