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

Make byte transform on seqs 1-to-1, re-add ISeq as a fallback implementation

Browse source
This commit is contained in:
Peter Taoussanis 2013-10-31 13:19:21 +07:00
parent aa78ad6a0b
commit 84e336fe65
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/taoensso/nippy.clj
View file

@ -13,11 +13,9 @@
[java.util Date UUID] [java.util Date UUID]
[clojure.lang Keyword BigInt Ratio [clojure.lang Keyword BigInt Ratio
APersistentMap APersistentVector APersistentSet APersistentMap APersistentVector APersistentSet
IPersistentList IPersistentMap ; IPersistentVector IPersistentSet IPersistentMap ; IPersistentVector IPersistentSet IPersistentList
PersistentQueue PersistentTreeMap PersistentTreeSet ; PersistentList PersistentQueue PersistentTreeMap PersistentTreeSet PersistentList ; LazySeq
LazySeq IRecord ISeq]))
IRecord ; ISeq
]))
;;;; Nippy 2.x+ header spec (4 bytes) ;;;; Nippy 2.x+ header spec (4 bytes)
(def ^:private ^:const head-version 1) (def ^:private ^:const head-version 1)
@ -116,6 +114,8 @@
(defmacro ^:private freezer-coll [type id & body] (defmacro ^:private freezer-coll [type id & body]
`(freezer ~type ~id `(freezer ~type ~id
#_(when (and debug-mode? (instance? ISeq ~type))
(println (format "DEBUG - freezer-coll: %s for %s" ~type (type ~'x))))
(if (counted? ~'x) (if (counted? ~'x)
(do (.writeInt ~'s (count ~'x)) (do (.writeInt ~'s (count ~'x))
(doseq [i# ~'x] (freeze-to-stream ~'s i#))) (doseq [i# ~'x] (freeze-to-stream ~'s i#)))
@ -153,8 +153,12 @@
(freezer-kvs APersistentMap id-map) (freezer-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 IPersistentList id-list) ; No APersistentList (freezer-coll PersistentList id-list) ; No APersistentList
(freezer-coll LazySeq id-seq) (freezer-coll (type '()) id-list)
;; Nb low-level interface!! Acts as fallback for seqs that don't have a
;; concrete implementation. Will conflict with any other coll interfaces!
(freezer-coll ISeq id-seq)
(freezer IRecord id-record (freezer IRecord id-record
(write-utf8 s (.getName (class x))) ; Reflect (write-utf8 s (.getName (class x))) ; Reflect
@ -189,14 +193,14 @@
(freeze-to-stream* [x ^DataOutputStream s] (freeze-to-stream* [x ^DataOutputStream s]
(if (instance? Serializable x) (if (instance? Serializable x)
(do ;; Fallback #1: Java's Serializable interface (do ;; Fallback #1: Java's Serializable interface
(when debug-mode? #_(when debug-mode?
(println (format "DEBUG - Serializable fallback: %s" (type x)))) (println (format "DEBUG - Serializable fallback: %s" (type x))))
(write-id s id-serializable) (write-id s id-serializable)
(write-utf8 s (.getName (class x))) ; Reflect (write-utf8 s (.getName (class x))) ; Reflect
(.writeObject (java.io.ObjectOutputStream. s) x)) (.writeObject (java.io.ObjectOutputStream. s) x))
(do ;; Fallback #2: Clojure's Reader (do ;; Fallback #2: Clojure's Reader
(when debug-mode? #_(when debug-mode?
(println (format "DEBUG - Reader fallback: %s" (type x)))) (println (format "DEBUG - Reader fallback: %s" (type x))))
(write-id s id-reader) (write-id s id-reader)
(write-bytes s (.getBytes (pr-str x) "UTF-8")))))) (write-bytes s (.getBytes (pr-str x) "UTF-8"))))))
@ -285,7 +289,7 @@
id-vector (read-coll s []) id-vector (read-coll s [])
id-set (read-coll s #{}) id-set (read-coll s #{})
id-map (read-kvs s {}) id-map (read-kvs s {})
id-seq (read-coll s []) id-seq (seq (read-coll 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))