24a8522b51
The phm had a FIXED 8 buckets, so a 100-entry map was a ~12-entry linear scan per lookup — and phm-get walked the bucket twice (contains? then find). This went mostly unnoticed until the canonical zipmap (batch 2) started returning phms where kvs->map had built structs for scalar keys, regressing the map-read bench ~7x (jolt-s3y). phm-assoc now rehashes into a doubled bucket array when the count passes 2 entries/bucket (done on the fresh copy, so persistence is untouched); phm-get is single-pass with a presence flag (nil values still distinguish from missing); key= tries identity/scalar equality before paying for canonicalization; the bucket count is derived from (length (m :buckets)), not a constant, so any already-marshaled map keeps working. core-contains?'s phm branch goes through phm-contains? instead of poking buckets directly. map-read 48.5 -> 10.9 ms (the residual vs the pre-batch-2 6.7 is the canonicalizing-representation constant); map-build steady; bench TOTAL 4457 vs 4565 on main back-to-back. New unit case crosses the resize boundary at 500 entries: every key found, nil values present, collection keys canonical, dissoc + persistence intact. Gate: jpm exit 0, conformance 326x3.
92 lines
4.2 KiB
Text
92 lines
4.2 KiB
Text
# Phase 2: PersistentHashMap Tests
|
|
# Uses Clojure = (core-=) for PHM-aware comparison
|
|
|
|
(use ../../src/jolt/api)
|
|
|
|
(defn ct-eval [ctx s] (normalize-pvecs (eval-string ctx s)))
|
|
|
|
# Helper: compare via Clojure = which handles PHM
|
|
(defn clj= [ctx a b]
|
|
(eval-string ctx (string "(= " a " " b ")")))
|
|
|
|
# ============================================================
|
|
# 1. Basic hash-map construction and access
|
|
# ============================================================
|
|
(print "1: hash-map construction...")
|
|
(let [ctx (init-cached)]
|
|
(def m1 (ct-eval ctx "(hash-map :a 1)"))
|
|
(assert (not (nil? m1)) "hash-map returns non-nil")
|
|
(assert (= true (ct-eval ctx "(map? (hash-map :a 1))")) "map? returns true for PHM")
|
|
(assert (= true (ct-eval ctx "(= (hash-map :a 1) {:a 1})")) "PHM = struct via Clojure =")
|
|
|
|
(assert (= 0 (ct-eval ctx "(count (hash-map))")) "count empty")
|
|
(assert (= 2 (ct-eval ctx "(count (hash-map :a 1 :b 2))")) "count two")
|
|
(assert (= 1 (ct-eval ctx "(get (hash-map :a 1 :b 2) :a)")) "get present")
|
|
(assert (= nil (ct-eval ctx "(get (hash-map :a 1) :z)")) "get missing"))
|
|
(print " passed")
|
|
|
|
# ============================================================
|
|
# 2. assoc and dissoc
|
|
# ============================================================
|
|
(print "2: assoc/dissoc...")
|
|
(let [ctx (init-cached)]
|
|
(assert (= true (ct-eval ctx "(= (assoc (hash-map :a 1) :b 2) (hash-map :a 1 :b 2))")) "assoc add")
|
|
(assert (= true (ct-eval ctx "(= (assoc (hash-map :a 1) :a 99) (hash-map :a 99))")) "assoc replace")
|
|
(assert (= true (ct-eval ctx "(= (dissoc (hash-map :a 1 :b 2) :a) (hash-map :b 2))")) "dissoc")
|
|
(assert (= true (ct-eval ctx "(contains? (hash-map :a 1) :a)")) "contains? true")
|
|
(assert (= false (ct-eval ctx "(contains? (hash-map :a 1) :z)")) "contains? false"))
|
|
(print " passed")
|
|
|
|
# ============================================================
|
|
# 3. keys, vals, merge
|
|
# ============================================================
|
|
(print "3: keys/vals/merge...")
|
|
(let [ctx (init-cached)]
|
|
(assert (= 2 (ct-eval ctx "(count (keys (hash-map :a 1 :b 2)))")) "keys count")
|
|
(assert (= 2 (ct-eval ctx "(count (vals (hash-map :a 1 :b 2)))")) "vals count")
|
|
(assert (= true (ct-eval ctx "(= (merge (hash-map :a 1) (hash-map :b 2)) (hash-map :a 1 :b 2))")) "merge"))
|
|
|
|
(print " passed")
|
|
|
|
# ============================================================
|
|
# 4. Empty and seq
|
|
# ============================================================
|
|
(print "4: empty? and seq...")
|
|
(let [ctx (init-cached)]
|
|
(assert (= true (ct-eval ctx "(empty? (hash-map))")) "empty? true")
|
|
(assert (= false (ct-eval ctx "(empty? (hash-map :a 1))")) "empty? false")
|
|
(assert (= 1 (ct-eval ctx "(count (seq (hash-map :a 1)))")) "seq count"))
|
|
(print " passed")
|
|
|
|
# ============================================================
|
|
# 5. Larger maps
|
|
# ============================================================
|
|
(print "5: larger maps...")
|
|
(let [ctx (init-cached)]
|
|
(eval-string ctx "
|
|
(def big-map
|
|
(reduce (fn [m i] (assoc m (keyword (str \"k\" i)) i))
|
|
(hash-map)
|
|
(range 100)))")
|
|
(assert (= 100 (ct-eval ctx "(count big-map)")) "count 100")
|
|
(assert (= 42 (ct-eval ctx "(get big-map :k42)")) "get k42"))
|
|
(print " passed")
|
|
|
|
(print "6: bucket resize (jolt-s3y)...")
|
|
(let [ctx (init-cached)]
|
|
# Crossing the load-factor boundary several times: every key still found,
|
|
# nil values preserved, collection keys still canonical, dissoc intact.
|
|
(eval-string ctx "
|
|
(def m (reduce (fn [m i] (assoc m i (* 10 i))) (hash-map) (range 500)))")
|
|
(assert (= 500 (ct-eval ctx "(count m)")) "count survives rehash")
|
|
(assert (= true (ct-eval ctx "(every? (fn [i] (= (* 10 i) (get m i))) (range 500))"))
|
|
"every key found after rehash")
|
|
(assert (= true (ct-eval ctx "(let [m2 (assoc m :nilv nil)] (and (contains? m2 :nilv) (nil? (get m2 :nilv :miss))))"))
|
|
"nil value present after rehash")
|
|
(assert (= :hit (ct-eval ctx "(get (assoc m [1 2] :hit) [1 2])"))
|
|
"collection key canonical after rehash")
|
|
(assert (= 499 (ct-eval ctx "(count (dissoc m 0))")) "dissoc after rehash")
|
|
(assert (= 500 (ct-eval ctx "(count m)")) "persistence: source unchanged"))
|
|
(print " passed")
|
|
|
|
(print "\nAll PersistentHashMap tests passed!")
|