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

Stop writing version headers

Browse source 
It's slow, and in practice doesn't offer anything better than deprecated per-type IDs.
This commit is contained in:
Peter Taoussanis 2012-08-15 23:23:20 +07:00
parent 5efd7b21ac
commit f20da14cb4
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/taoensso/nippy.clj
View file

@ -12,8 +12,6 @@
;;;; Define type IDs ;;;; Define type IDs
(def ^:const schema-header "\u0000~0.9.0")
;; 1 ;; 1
(def ^:const id-bytes (int 2)) (def ^:const id-bytes (int 2))
(def ^:const id-nil (int 3)) (def ^:const id-nil (int 3))
@ -156,7 +154,6 @@
"Serializes x to given output stream." "Serializes x to given output stream."
[data-output-stream x] [data-output-stream x]
(binding [*print-dup* true] ; For `pr-str` (binding [*print-dup* true] ; For `pr-str`
(freeze-to-stream!* data-output-stream schema-header)
(freeze-to-stream!* data-output-stream x))) (freeze-to-stream!* data-output-stream x)))
(defn freeze-to-bytes (defn freeze-to-bytes
@ -223,22 +220,12 @@
(throw (Exception. (str "Failed to thaw unknown type ID: " type-id)))))) (throw (Exception. (str "Failed to thaw unknown type ID: " type-id))))))
;; TODO Scheduled for Carmine version 1.0.0
;; (defn thaw-from-stream!
;; "Deserializes an object from given input stream."
;; [data-input-stream read-eval?]
;; (binding [*read-eval* read-eval?]
;; (let [schema-header (thaw-from-stream!* data-input-stream)]
;; (thaw-from-stream!* data-input-stream))))
;; DEPRECATED: Includes temporary support for older versions of serialization
;; schema that didn't include a version header. This is for people that used
;; Carmine < 0.8.3 and haven't yet migrated their databases.
(defn thaw-from-stream! (defn thaw-from-stream!
"Deserializes an object from given input stream." "Deserializes an object from given input stream."
[data-input-stream read-eval?] [data-input-stream read-eval?]
(binding [*read-eval* read-eval?] (binding [*read-eval* read-eval?]
(let [maybe-schema-header (thaw-from-stream!* data-input-stream)] (let [;; Support older versions of Nippy that wrote a version header
maybe-schema-header (thaw-from-stream!* data-input-stream)]
(if (and (string? maybe-schema-header) (if (and (string? maybe-schema-header)
(.startsWith ^String maybe-schema-header "\u0000~")) (.startsWith ^String maybe-schema-header "\u0000~"))
(thaw-from-stream!* data-input-stream) (thaw-from-stream!* data-input-stream)