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

Swap IPersistentCollection->ISeq (the former seems to interfere with IRecord dispatch)

Browse source
This commit is contained in:
Peter Taoussanis 2013-08-07 17:03:55 +07:00
parent a76734a25a
commit 8e1d649bcb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/taoensso/nippy.clj
View file

@ -13,7 +13,7 @@
[java.util Date UUID] [java.util Date UUID]
[clojure.lang Keyword BigInt Ratio PersistentQueue PersistentTreeMap [clojure.lang Keyword BigInt Ratio PersistentQueue PersistentTreeMap
PersistentTreeSet IPersistentList IPersistentVector IPersistentMap PersistentTreeSet IPersistentList IPersistentVector IPersistentMap
IPersistentSet IPersistentCollection IRecord])) IPersistentMap IPersistentSet ISeq IRecord]))
;;;; 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)
@ -45,7 +45,7 @@
(def ^:const id-vector (int 21)) (def ^:const id-vector (int 21))
;; 22 ;; 22
(def ^:const id-set (int 23)) (def ^:const id-set (int 23))
(def ^:const id-coll (int 24)) ; Fallback: non-specific collection (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 27))
@ -156,7 +156,7 @@
(coll-freezer IPersistentVector id-vector) (coll-freezer IPersistentVector id-vector)
(coll-freezer IPersistentSet id-set) (coll-freezer IPersistentSet id-set)
(kv-freezer IPersistentMap id-map) (kv-freezer IPersistentMap id-map)
(coll-freezer IPersistentCollection id-coll) ; Must be LAST collection freezer! (coll-freezer ISeq id-seq)
(freezer Byte id-byte (.writeByte s x)) (freezer Byte id-byte (.writeByte s x))
(freezer Short id-short (.writeShort s x)) (freezer Short id-short (.writeShort s x))
@ -260,7 +260,7 @@
id-vector (coll-thaw s []) id-vector (coll-thaw s [])
id-set (coll-thaw s #{}) id-set (coll-thaw s #{})
id-map (coll-thaw-kvs s {}) id-map (coll-thaw-kvs s {})
id-coll (seq (coll-thaw s [])) id-seq (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))