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

Optimize collection creation (much faster)

Browse source
This commit is contained in:
Peter Taoussanis 2013-06-13 02:27:00 +07:00
parent e5a9e1f671
commit bfc16ce3ab
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/taoensso/nippy.clj
View file

@ -167,13 +167,13 @@
(defn coll-thaw (defn coll-thaw
"Thaws simple collection types." "Thaws simple collection types."
[^DataInputStream s] [coll ^DataInputStream s]
(utils/repeatedly* (.readInt s) #(thaw-from-stream s))) (utils/repeatedly* coll (.readInt s) #(thaw-from-stream s)))
(defn coll-thaw-kvs (defn coll-thaw-kvs
"Thaws key-value collection types." "Thaws key-value collection types."
[^DataInputStream s] [coll ^DataInputStream s]
(utils/repeatedly* (/ (.readInt s) 2) (utils/repeatedly* coll (/ (.readInt s) 2)
(fn [] [(thaw-from-stream s) (thaw-from-stream s)]))) (fn [] [(thaw-from-stream s) (thaw-from-stream s)])))
(defn- thaw-from-stream (defn- thaw-from-stream
@ -191,17 +191,15 @@
id-string (String. (read-bytes s) "UTF-8") id-string (String. (read-bytes s) "UTF-8")
id-keyword (keyword (.readUTF s)) id-keyword (keyword (.readUTF s))
id-queue (into (PersistentQueue/EMPTY) (coll-thaw s)) id-queue (coll-thaw (PersistentQueue/EMPTY) s)
id-sorted-set (into (sorted-set) (coll-thaw s)) id-sorted-set (coll-thaw (sorted-set) s)
id-sorted-map (into (sorted-map) (coll-thaw-kvs s)) id-sorted-map (coll-thaw-kvs (sorted-map) s)
;;id-list (into '() (reverse (coll-thaw s))) id-list (into '() (rseq (coll-thaw [] s)))
;;id-vector (into [] (coll-thaw s)) id-vector (coll-thaw [] s)
id-list (into '() (rseq (coll-thaw s))) id-set (coll-thaw #{} s)
id-vector (into [] (coll-thaw s)) id-map (coll-thaw-kvs {} s)
id-set (into #{} (coll-thaw s)) id-coll (seq (coll-thaw [] s))
id-map (into {} (coll-thaw-kvs s))
id-coll (doall (coll-thaw s))
id-meta (let [m (thaw-from-stream s)] (with-meta (thaw-from-stream s) m)) id-meta (let [m (thaw-from-stream s)] (with-meta (thaw-from-stream s) m))
@ -221,7 +219,7 @@
;;; DEPRECATED ;;; DEPRECATED
id-old-reader (read-string (.readUTF s)) id-old-reader (read-string (.readUTF s))
id-old-string (.readUTF s) id-old-string (.readUTF s)
id-old-map (apply hash-map (utils/repeatedly* (* 2 (.readInt s)) id-old-map (apply hash-map (repeatedly (* 2 (.readInt s))
#(thaw-from-stream s))) #(thaw-from-stream s)))
(throw (Exception. (str "Failed to thaw unknown type ID: " type-id)))))) (throw (Exception. (str "Failed to thaw unknown type ID: " type-id))))))

14
src/taoensso/nippy/utils.clj
View file

@ -13,12 +13,18 @@
clauses) clauses)
~(when default default)))) ~(when default default))))
(defn repeatedly* "Like `repeatedly` but faster and returns a vector." (defn repeatedly*
[n f] "Like `repeatedly` but faster and returns given collection type."
(loop [v (transient []) idx 0] [coll n f]
(if-not (instance? clojure.lang.IEditableCollection coll)
(loop [v coll idx 0]
(if (>= idx n)
v
(recur (conj v (f)) (inc idx))))
(loop [v (transient coll) idx 0]
(if (>= idx n) (if (>= idx n)
(persistent! v) (persistent! v)
(recur (conj! v (f)) (inc idx))))) (recur (conj! v (f)) (inc idx))))))
(defmacro time-ns "Returns number of nanoseconds it takes to execute body." (defmacro time-ns "Returns number of nanoseconds it takes to execute body."
[& body] `(let [t0# (System/nanoTime)] ~@body (- (System/nanoTime) t0#))) [& body] `(let [t0# (System/nanoTime)] ~@body (- (System/nanoTime) t0#)))