greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Review comment: save allocations when evolving.

Browse source
This commit is contained in:
Nick Alexander 2016-10-13 21:40:33 -07:00
parent 679ab8cf7d
commit 3670c5cce7
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/common/datomish/transact.cljc
View file

@ -406,18 +406,17 @@
(defn evolve-upserts-e [id->e upserts-e] (defn evolve-upserts-e [id->e upserts-e]
(let [evolve1 (let [evolve1
(fn [[op id-e a v]] (fn [[op id-e a v :as entity]]
(let [e* (get id->e id-e)] (if-let [e* (get id->e id-e)]
(if e* [:upserted [op e* a v]]
[:upserted [op e* a v]] [:allocations-e entity]))]
[:allocations-e [op id-e a v]])))]
(util/group-by-kv evolve1 upserts-e))) (util/group-by-kv evolve1 upserts-e)))
(defn evolve-upserts-ev [id->e upserts-ev] (defn evolve-upserts-ev [id->e upserts-ev]
"Given a map id->e of id-literals to integer entids, evolve the given entities. Returns a map "Given a map id->e of id-literals to integer entids, evolve the given entities. Returns a map
whose keys are generations and whose values are vectors of entities in those generations." whose keys are generations and whose values are vectors of entities in those generations."
(let [evolve1 (let [evolve1
(fn [[op id-e a id-v]] (fn [[op id-e a id-v :as entity]]
(let [e* (get id->e id-e) (let [e* (get id->e id-e)
v* (get id->e id-v)] v* (get id->e id-v)]
(if e* (if e*
@ -426,36 +425,34 @@
[:allocations-v [op e* a id-v]]) [:allocations-v [op e* a id-v]])
(if v* (if v*
[:upserts-e [op id-e a v*]] [:upserts-e [op id-e a v*]]
[:upserts-ev [op id-e a id-v]]))))] [:upserts-ev entity]))))]
(util/group-by-kv evolve1 upserts-ev))) (util/group-by-kv evolve1 upserts-ev)))
(defn evolve-allocations-e [id->e allocations-e] (defn evolve-allocations-e [id->e allocations-e]
"Given a map id->e of id-literals to integer entids, evolve the given entities. Returns a map "Given a map id->e of id-literals to integer entids, evolve the given entities. Returns a map
whose keys are generations and whose values are vectors of entities in those generations." whose keys are generations and whose values are vectors of entities in those generations."
(let [evolve1 (let [evolve1
(fn [[op id-e a v]] (fn [[op id-e a v :as entity]]
(let [e* (get id->e id-e)] (if-let [e* (get id->e id-e)]
(if e* [:resolved [op e* a v]]
[:resolved [op e* a v]] [:allocations-e entity]))]
[:allocations-e [op id-e a v]])))]
(util/group-by-kv evolve1 allocations-e))) (util/group-by-kv evolve1 allocations-e)))
(defn evolve-allocations-v [id->e allocations-v] (defn evolve-allocations-v [id->e allocations-v]
"Given a map id->e of id-literals to integer entids, evolve the given entities. Returns a map "Given a map id->e of id-literals to integer entids, evolve the given entities. Returns a map
whose keys are generations and whose values are vectors of entities in those generations." whose keys are generations and whose values are vectors of entities in those generations."
(let [evolve1 (let [evolve1
(fn [[op e a id-v]] (fn [[op e a id-v :as entity]]
(let [v* (get id->e id-v)] (if-let [v* (get id->e id-v)]
(if v* [:resolved [op e a v*]]
[:resolved [op e a v*]] [:allocations-v entity]))]
[:allocations-v [op e a id-v]])))]
(util/group-by-kv evolve1 allocations-v))) (util/group-by-kv evolve1 allocations-v)))
(defn evolve-allocations-ev [id->e allocations-ev] (defn evolve-allocations-ev [id->e allocations-ev]
"Given a map id->e of id-literals to integer entids, evolve the entities in allocations-ev. Returns a "Given a map id->e of id-literals to integer entids, evolve the entities in allocations-ev. Returns a
map whose keys are generations and whose values are vectors of entities in those generations." map whose keys are generations and whose values are vectors of entities in those generations."
(let [evolve1 (let [evolve1
(fn [[op id-e a id-v]] (fn [[op id-e a id-v :as entity]]
(let [e* (get id->e id-e) (let [e* (get id->e id-e)
v* (get id->e id-v)] v* (get id->e id-v)]
(if e* (if e*
@ -464,7 +461,7 @@
[:allocations-v [op e* a id-v]]) [:allocations-v [op e* a id-v]])
(if v* (if v*
[:allocations-e [op id-e a v*]] [:allocations-e [op id-e a v*]]
[:allocations-ev [op id-e a id-v]]))))] [:allocations-ev entity]))))]
(util/group-by-kv evolve1 allocations-ev))) (util/group-by-kv evolve1 allocations-ev)))
(defn <evolve [db evolution] (defn <evolve [db evolution]