Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

irmin-tezos: simplify the way we serialise nodes #2014

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

irmin-tezos: simplify the way we serialise nodes #2014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
289249c
irmin-tezos: simplify the way we serialise nodes
samoht Jul 22, 2022
430fdbc
irmin-tezos: unroll allocation hotspot
samoht Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 11 additions & 17 deletions src/irmin-tezos/schema.ml
View file
Open in desktop
Expand Up @@ -76,13 +76,6 @@ struct

type entry = string * M.value

(* Irmin 1.4 uses int8 to store filename lengths.

Irmin 2 use a variable-size encoding for strings; this is using int8
for strings of size stricly less than 128 (e.g. 2^7) which happen to
be the case for all filenames ever produced by Irmin 1.4. *)
let step_t = Irmin.Type.string

let metadata_t =
let some = "\255\000\000\000\000\000\000\000" in
let none = "\000\000\000\000\000\000\000\000" in
Expand All @@ -103,23 +96,24 @@ struct
let open Irmin.Type in
record "Tree.entry" (fun _ _ _ -> assert false)
|+ field "kind" metadata_t metadata_of_entry
|+ field "name" step_t fst
|+ field "name" string fst
|+ field "hash" Hash.t hash_of_entry
|> sealr

let entries_t : entry list Irmin.Type.t =
Irmin.Type.(list ~len:`Int64 entry_t)

let pre_hash_entry = Irmin.Type.(unstage (pre_hash entry_t))
let pre_hash_entries = Irmin.Type.(unstage (pre_hash entries_t))
let compare_entry (x, _) (y, _) = String.compare x y
let step_to_string = Irmin.Type.(unstage (to_bin_string Path.step_t))
let str_key (k, v) = (step_to_string k, v)

let pre_hash t =
M.list t
|> List.map str_key
|> List.fast_sort compare_entry
|> pre_hash_entries
let encode_bin_int64 = Irmin.Type.(unstage (pre_hash int64))

let pre_hash t f =
match M.length t with
| 0 -> pre_hash_entries [] f
| 1 ->
encode_bin_int64 1L f;
pre_hash_entry (List.hd (M.list t)) f
| _ -> pre_hash_entries (M.list t) f
end

include M
Expand Down