luciano/nippy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Experimental/perf: kvs work directly against MapEntry

Browse source
This commit is contained in:
Peter Taoussanis 2015-09-17 13:40:24 +07:00
parent 9d4db3106e
commit aa9a18088f
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/taoensso/nippy.clj
View file

@ -86,7 +86,7 @@
(def ^:const id-seq (int 24)) (def ^:const id-seq (int 24))
(def ^:const id-meta (int 25)) (def ^:const id-meta (int 25))
(def ^:const id-queue (int 26)) (def ^:const id-queue (int 26))
(def ^:const id-map (int 27)) (def ^:const id-map (int 30))
(def ^:const id-sorted-set (int 28)) (def ^:const id-sorted-set (int 28))
(def ^:const id-sorted-map (int 29)) (def ^:const id-sorted-map (int 29))
@ -124,10 +124,11 @@
;; (def ^:const id-map-small (int 112)) ; '' ;; (def ^:const id-map-small (int 112)) ; ''
;;; DEPRECATED (old types will be supported only for thawing) ;;; DEPRECATED (old types will be supported only for thawing)
(def ^:const id-old-reader (int 1)) ; v0.9.2+ for +64k support (def ^:const id-reader-v1 (int 1)) ; v0.9.2+ for +64k support
(def ^:const id-old-string (int 11)) ; v0.9.2+ for +64k support (def ^:const id-string-v1 (int 11)) ; v0.9.2+ for +64k support
(def ^:const id-old-map (int 22)) ; v0.9.0+ for more efficient thaw (def ^:const id-map-v1 (int 22)) ; v0.9.0+ for more efficient thaw
(def ^:const id-old-keyword (int 12)) ; v2.0.0-alpha5+ for str consistecy (def ^:const id-keyword-v1 (int 12)) ; v2.0.0-alpha5+ for str consistecy
(def ^:const id-map-v2 (int 27)) ; v2.11 for more efficient freeze+thaw
) )
;;;; Ns imports (mostly for convenience of lib consumers) ;;;; Ns imports (mostly for convenience of lib consumers)
@ -215,13 +216,22 @@
(defmacro ^:private freezer-kvs [type id & body] (defmacro ^:private freezer-kvs [type id & body]
`(freezer ~type ~id `(freezer ~type ~id
(.writeInt ~'out (* 2 (count ~'x))) (.writeInt ~'out (* 2 (count ~'x))) ; The *2 is vestigial
(encore/backport-run! (encore/backport-run!
(fn [kv#] (fn [kv#]
(freeze-to-out ~'out (key kv#)) (freeze-to-out ~'out (key kv#))
(freeze-to-out ~'out (val kv#))) (freeze-to-out ~'out (val kv#)))
~'x))) ~'x)))
(defmacro ^:private freezer-mapent-kvs [type id & body]
`(freezer ~type ~id
(.writeInt ~'out (count ~'x))
(encore/backport-run!
(fn [kv#]
(freeze-to-out ~'out (.getKey ^clojure.lang.MapEntry kv#))
(freeze-to-out ~'out (.getValue ^clojure.lang.MapEntry kv#)))
~'x)))
(freezer (Class/forName "[B") id-bytes (write-bytes out ^bytes x)) (freezer (Class/forName "[B") id-bytes (write-bytes out ^bytes x))
(freezer nil id-nil) (freezer nil id-nil)
(freezer Boolean id-boolean (.writeBoolean out x)) (freezer Boolean id-boolean (.writeBoolean out x))
@ -259,7 +269,7 @@
(freezer-coll PersistentTreeSet id-sorted-set) (freezer-coll PersistentTreeSet id-sorted-set)
(freezer-kvs PersistentTreeMap id-sorted-map) (freezer-kvs PersistentTreeMap id-sorted-map)
(freezer-kvs APersistentMap id-map) (freezer-mapent-kvs APersistentMap id-map)
(freezer-coll APersistentVector id-vector) (freezer-coll APersistentVector id-vector)
(freezer-coll APersistentSet id-set) (freezer-coll APersistentSet id-set)
(freezer-coll PersistentList id-list) ; No APersistentList (freezer-coll PersistentList id-list) ; No APersistentList
@ -452,9 +462,15 @@
(defmacro ^:private read-kvs [in coll] (defmacro ^:private read-kvs [in coll]
`(let [in# ~in] `(let [in# ~in]
(encore/repeatedly-into* ~coll (quot (.readInt in#) 2) (encore/repeatedly-into* ~coll
(quot (.readInt in#) 2) ; The /2 is vestigial
[(thaw-from-in in#) (thaw-from-in in#)]))) [(thaw-from-in in#) (thaw-from-in in#)])))
(defmacro ^:private read-mapent-kvs [in coll]
`(let [in# ~in]
(encore/repeatedly-into* ~coll (.readInt in#)
(clojure.lang.MapEntry. (thaw-from-in in#) (thaw-from-in in#)))))
(def ^:private class-method-sig (into-array Class [IPersistentMap])) (def ^:private class-method-sig (into-array Class [IPersistentMap]))
(def ^:dynamic *custom-readers* "{<hash-or-byte-id> (fn [data-input])}" nil) (def ^:dynamic *custom-readers* "{<hash-or-byte-id> (fn [data-input])}" nil)
@ -540,7 +556,7 @@
id-list (into '() (rseq (read-coll in []))) id-list (into '() (rseq (read-coll in [])))
id-vector (read-coll in []) id-vector (read-coll in [])
id-set (read-coll in #{}) id-set (read-coll in #{})
id-map (read-kvs in {}) id-map (read-mapent-kvs in {})
id-seq (or (seq (read-coll in [])) id-seq (or (seq (read-coll in []))
(lazy-seq nil) ; Empty coll (lazy-seq nil) ; Empty coll
) )
@ -576,11 +592,12 @@
id-uuid (UUID. (.readLong in) (.readLong in)) id-uuid (UUID. (.readLong in) (.readLong in))
;;; DEPRECATED ;;; DEPRECATED
id-old-reader (encore/read-edn (.readUTF in)) id-map-v2 (read-kvs in {})
id-old-string (.readUTF in) id-reader-v1 (encore/read-edn (.readUTF in))
id-old-map (apply hash-map (encore/repeatedly-into* [] id-string-v1 (.readUTF in)
id-map-v1 (apply hash-map (encore/repeatedly-into* []
(* 2 (.readInt in)) (thaw-from-in in))) (* 2 (.readInt in)) (thaw-from-in in)))
id-old-keyword (keyword (.readUTF in)) id-keyword-v1 (keyword (.readUTF in))
id-prefixed-custom ; Prefixed custom type id-prefixed-custom ; Prefixed custom type
(let [hash-id (.readShort in)] (let [hash-id (.readShort in)]