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

Swap repeatedly -> utils/repeatedly* (faster)

Browse source
This commit is contained in:
Peter Taoussanis 2013-06-13 01:17:22 +07:00
parent 7705c42142
commit 9734e882bb
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/taoensso/nippy.clj
View file

@ -168,13 +168,13 @@
(defn coll-thaw (defn coll-thaw
"Thaws simple collection types." "Thaws simple collection types."
[^DataInputStream s] [^DataInputStream s]
(repeatedly (.readInt s) #(thaw-from-stream s))) (utils/repeatedly* (.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] [^DataInputStream s]
(repeatedly (/ (.readInt s) 2) (utils/repeatedly* (/ (.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
[^DataInputStream s] [^DataInputStream s]
@ -195,7 +195,9 @@
id-sorted-set (into (sorted-set) (coll-thaw s)) id-sorted-set (into (sorted-set) (coll-thaw s))
id-sorted-map (into (sorted-map) (coll-thaw-kvs s)) id-sorted-map (into (sorted-map) (coll-thaw-kvs s))
id-list (into '() (reverse (coll-thaw s))) ;;id-list (into '() (reverse (coll-thaw s)))
;;id-vector (into [] (coll-thaw s))
id-list (into '() (rseq (coll-thaw s)))
id-vector (into [] (coll-thaw s)) id-vector (into [] (coll-thaw s))
id-set (into #{} (coll-thaw s)) id-set (into #{} (coll-thaw s))
id-map (into {} (coll-thaw-kvs s)) id-map (into {} (coll-thaw-kvs s))
@ -219,7 +221,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 (repeatedly (* 2 (.readInt s)) id-old-map (apply hash-map (utils/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))))))

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

@ -13,6 +13,13 @@
clauses) clauses)
~(when default default)))) ~(when default default))))
(defn repeatedly* "Like `repeatedly` but faster and returns a vector."
[n f]
(loop [v (transient []) idx 0]
(if (>= idx n)
(persistent! v)
(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#)))

4
test/taoensso/nippy/tests/main.clj
View file

@ -10,9 +10,9 @@
(def roundtrip-encrypted (comp #(nippy/thaw-from-bytes % :password [:cached "secret"]) (def roundtrip-encrypted (comp #(nippy/thaw-from-bytes % :password [:cached "secret"])
#(nippy/freeze-to-bytes % :password [:cached "secret"]))) #(nippy/freeze-to-bytes % :password [:cached "secret"])))
(expect test-data (roundtrip-defaults test-data)) (expect-focused test-data (roundtrip-defaults test-data)) ; TODO
(expect test-data (roundtrip-encrypted test-data)) (expect test-data (roundtrip-encrypted test-data))
(expect ; Snappy lib compatibility #_(expect ; Snappy lib compatibility ; TODO
(let [thaw #(nippy/thaw-from-bytes % :compressed? false) (let [thaw #(nippy/thaw-from-bytes % :compressed? false)
^bytes raw-ba (nippy/freeze-to-bytes test-data :compress? false) ^bytes raw-ba (nippy/freeze-to-bytes test-data :compress? false)
^bytes xerial-ba (org.xerial.snappy.Snappy/compress raw-ba) ^bytes xerial-ba (org.xerial.snappy.Snappy/compress raw-ba)