gered/aging-session
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

some refactoring that will be useful for upcoming expiry listener stuff

Browse source 
unfortunately this seems to hurt read-session performance slightly
This commit is contained in:
Gered 2022-01-03 17:05:48 -05:00
parent f71ca8985a
commit c40c663bde
1 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/aging_session/core.clj
View file

@ -22,13 +22,6 @@
[data] [data]
(SessionEntry. (now) data)) (SessionEntry. (now) data))
(defn- write-entry
"Write over an existing entry. If timestamp is missing, recreate."
[session-map key data]
(if (get-in session-map [key :timestamp])
(assoc-in session-map [key :value] data)
(assoc session-map key (new-entry data))))
(defn- entry-expired? (defn- entry-expired?
"Returns true if the given session entry has expired according to its current timestamp and the session store's "Returns true if the given session entry has expired according to its current timestamp and the session store's
configured ttl" configured ttl"
@ -53,6 +46,27 @@
(dissoc session-map key)) (dissoc session-map key))
session-map)) session-map))
(defn- process-read-entry
[session-map ttl key refresh-on-read?]
; call sweep-entry on this key first, to ensure this key is expired if needed BEFORE we allow its value to be read
(let [session-map (sweep-entry session-map ttl key)]
(if (and refresh-on-read?
(contains? session-map key))
(assoc-in session-map [key :timestamp] (now))
session-map)))
(defn- process-write-entry
[session-map key data refresh-on-write?]
(if refresh-on-write?
; just blindly write a new entry if we're refreshing-on-write, as obviously in that case, we don't care what,
; if any, existing value and timestamp was there to begin with ...
(assoc session-map key (new-entry data))
; when not refreshing-on-write, we only need to update the entry value if there is an existing entry. otherwise,
; it is of course a brand new entry
(if (contains? session-map key)
(assoc-in session-map [key :value] data)
(assoc session-map key (new-entry data)))))
(defprotocol AgingStore (defprotocol AgingStore
(read-timestamp [store key] (read-timestamp [store key]
"Read a session from the store and return its timestamp. If no key exists, returns nil.") "Read a session from the store and return its timestamp. If no key exists, returns nil.")
@ -71,18 +85,17 @@
SessionStore SessionStore
(read-session [_ key] (read-session [_ key]
(when (contains? @session-atom key) (when (contains? @session-atom key)
(swap! session-atom sweep-entry ttl key) (let [session-map (swap! session-atom process-read-entry ttl key refresh-on-read)]
(when (and refresh-on-read (contains? @session-atom key)) (if (contains? session-map key)
(swap! session-atom assoc-in [key :timestamp] (now))) (get-in session-map [key :value])
(get-in @session-atom [key :value]))) ; TODO: notify expiry listener about expired 'key' here
))))
(write-session [_ key data] (write-session [_ key data]
(let [key (or key (unique-id))] (let [key (or key (unique-id))]
(if op-threshold (if op-threshold
(swap! op-counter inc)) (swap! op-counter inc))
(if refresh-on-write (swap! session-atom process-write-entry key data refresh-on-write)
(swap! session-atom assoc key (new-entry data))
(swap! session-atom write-entry key data))
key)) key))
(delete-session [_ key] (delete-session [_ key]