michael/grub-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Store max 20 history states, reset on client when server ACKs

Browse source
This commit is contained in:
Nicholas Kariniemi 2014-10-06 22:13:50 +03:00
parent f0e16817b5
commit 12ac165f24
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cljx/grub/state.cljx
View file

@ -20,8 +20,10 @@
(let [new-states (sync/apply-diff states* (:diff msg)) (let [new-states (sync/apply-diff states* (:diff msg))
new-shadow (diff/patch-state shadow (:diff msg)) new-shadow (diff/patch-state shadow (:diff msg))
{:keys [diff hash]} (sync/diff-states (sync/get-current-state new-states) new-shadow)] {:keys [diff hash]} (sync/diff-states (sync/get-current-state new-states) new-shadow)]
(when-not (= states* new-states) (if client?
(reset! states new-states)) (reset! states (sync/new-state (sync/get-current-state new-states)))
(when-not (= states* new-states)
(reset! states new-states)))
(when-not (or client? (sync/empty-diff? (:diff msg))) (when-not (or client? (sync/empty-diff? (:diff msg)))
(>! out (message/diff-msg diff hash))) (>! out (message/diff-msg diff hash)))
(if client? (if client?

7
src/cljx/grub/sync.cljx
View file

@ -3,6 +3,8 @@
[grub.util :as util] [grub.util :as util]
[hasch.core :as hasch])) [hasch.core :as hasch]))
(def num-history-states 20)
(def empty-state {:grubs {} :recipes {}}) (def empty-state {:grubs {} :recipes {}})
(defn initial-state [grubs recipes] (defn initial-state [grubs recipes]
@ -25,7 +27,10 @@
new-hash (hasch/uuid new-state)] new-hash (hasch/uuid new-state)]
(if (= last-hash new-hash) (if (= last-hash new-hash)
states states
(conj states {:hash new-hash :state new-state})))) (let [new-states (conj states {:hash new-hash :state new-state})]
(if (>= (count states) num-history-states)
(into [] (rest new-states))
new-states)))))
(defn diff-states [states shadow] (defn diff-states [states shadow]
(let [state states;(get-current-state states) (let [state states;(get-current-state states)

2
src/test/grub/test/unit/state.clj
View file

@ -197,8 +197,6 @@
(>!! client-in msg) (>!! client-in msg)
(<!!? client-state-changes) (<!!? client-state-changes)
@client-states => (hashed-states @client-states => (hashed-states
{:grubs {"1" {:completed false, :text "2 apples"}}, :recipes {}}
{:grubs {"1" {:completed true, :text "2 apples"}}, :recipes {}}
{:grubs {"1" {:completed true, :text "4 apples"}}, :recipes {}}) {:grubs {"1" {:completed true, :text "4 apples"}}, :recipes {}})
@server-states => (hashed-states @server-states => (hashed-states
{:grubs {"1" {:completed false, :text "2 apples"}}, :recipes {}} {:grubs {"1" {:completed false, :text "2 apples"}}, :recipes {}}