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

[mod] Don't attach empty metadata

Browse source
This commit is contained in:
Peter Taoussanis 2024-04-09 09:01:31 +02:00
parent 37cf415c02
commit 82a050b925
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/taoensso/nippy.clj
View file

@ -596,7 +596,7 @@
(extend-protocol IFreezableWithMeta (extend-protocol IFreezableWithMeta
clojure.lang.IObj ; IMeta => `meta` will work, IObj => `with-meta` will work clojure.lang.IObj ; IMeta => `meta` will work, IObj => `with-meta` will work
(-freeze-with-meta! [x ^DataOutput data-output] (-freeze-with-meta! [x ^DataOutput data-output]
(when-let [m (when *incl-metadata?* (meta x))] (when-let [m (when *incl-metadata?* (not-empty (meta x)))]
(write-id data-output id-meta) (write-id data-output id-meta)
(write-map data-output m :is-metadata)) (write-map data-output m :is-metadata))
(-freeze-without-meta! x data-output)) (-freeze-without-meta! x data-output))
@ -1535,10 +1535,11 @@
id-meta-protocol-key ::meta-protocol-key id-meta-protocol-key ::meta-protocol-key
id-meta id-meta
(let [m (thaw-from-in! in)] (let [m (thaw-from-in! in) ; Always consume from stream
(if *incl-metadata?* x (thaw-from-in! in)]
(with-meta (thaw-from-in! in) (dissoc m ::meta-protocol-key)) (if-let [m (when *incl-metadata?* (not-empty (dissoc m ::meta-protocol-key)))]
(do (thaw-from-in! in)))) (with-meta x m)
(do x)))
id-cached-0 (thaw-cached 0 in) id-cached-0 (thaw-cached 0 in)
id-cached-1 (thaw-cached 1 in) id-cached-1 (thaw-cached 1 in)

6
test/taoensso/nippy_tests.clj
View file

@ -97,8 +97,10 @@
(is (enc/throws? :ex-info "Unfreezable type" (nippy/freeze (fn [])))) (is (enc/throws? :ex-info "Unfreezable type" (nippy/freeze (fn []))))
(testing "Clojure v1.10+ metadata protocol extensions" (testing "Clojure v1.10+ metadata protocol extensions"
[(is (= (meta (nippy/thaw (nippy/freeze (with-meta [] {:a :A, 'b/c (fn [])})))) {:a :A})) [(is (enc/throws? :ex-info "Unfreezable type" (nippy/freeze (with-meta [] {:a :A, 'b (fn [])}))))
(is (enc/throws? :ex-info "Unfreezable type" (nippy/freeze (with-meta [] {:a :A, 'b (fn [])}))))]) (is (= {:a :A} (meta (nippy/thaw (nippy/freeze (with-meta [] {:a :A, 'b/c (fn [])}))))))
(is (= nil (meta (nippy/thaw (nippy/freeze (with-meta [] { 'b/c (fn [])})))))
"Don't attach empty metadata")])
(is (gen-test 1600 [gen-data] (= gen-data (thaw (freeze gen-data)))) "Generative")]) (is (gen-test 1600 [gen-data] (= gen-data (thaw (freeze gen-data)))) "Generative")])