Bump PSS to 0.2.3

tonsky · Dec 3, 2022 · 8d560ad · 8d560ad
1 parent e8ba04f
commit 8d560ad
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/deps.edn b/deps.edn
@@ -1,6 +1,6 @@
 { 
   :deps {
-    persistent-sorted-set/persistent-sorted-set {:mvn/version "0.1.4"}
+    persistent-sorted-set/persistent-sorted-set {:mvn/version "0.2.3"}
   }
 
   :aliases {
@@ -42,7 +42,7 @@
 
     :nrepl {
       :extra-deps {
-        nrepl/nrepl {:mvn/version "0.9.0"}
+        nrepl/nrepl {:mvn/version "1.0.0"}
         lambdaisland/deep-diff2 {:mvn/version "2.0.108"}
       }
     }

diff --git a/project.clj b/project.clj
@@ -8,8 +8,8 @@
 
   :dependencies [
     [org.clojure/clojure       "1.10.2"   :scope "provided"]
-    [org.clojure/clojurescript "1.10.520" :scope "provided"]
-    [persistent-sorted-set     "0.1.4"]
+    [org.clojure/clojurescript "1.10.844" :scope "provided"]
+    [persistent-sorted-set     "0.2.3"]
   ]
 
   :plugins [

diff --git a/script/nrepl.sh b/script/nrepl.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
+set -o errexit -o nounset -o pipefail
+cd "`dirname $0`/.."
 
 clj -A:test:bench:datomic:nrepl -M -m nrepl.cmdline --interactive
diff --git a/src/datascript/db.cljc b/src/datascript/db.cljc
@@ -911,6 +911,19 @@
         :pull-attrs    (lru/cache 100)
         :hash          (atom 0)}))))
 
+(defn restore-db [{:keys [schema eavt aevt avet max-eid max-tx]}]
+  (map->DB
+    {:schema        schema
+     :rschema       (rschema (merge implicit-schema schema))
+     :eavt          eavt
+     :aevt          aevt
+     :avet          avet
+     :max-eid       max-eid
+     :max-tx        max-tx
+     :pull-patterns (lru/cache 100)
+     :pull-attrs    (lru/cache 100)
+     :hash          (atom 0)}))
+
 (defn- equiv-db-index [x y]
   (loop [xs (seq x)
          ys (seq y)]

diff --git a/src/datascript/serialize.cljc b/src/datascript/serialize.cljc
@@ -217,14 +217,10 @@
                     #?(:clj arrays/into-array))
          aevt     (some->> (dict-get from "aevt") (amap #(arrays/aget eavt %)) #?(:clj arrays/into-array))
          avet     (some->> (dict-get from "avet") (amap #(arrays/aget eavt %)) #?(:clj arrays/into-array))]
-     (db/map->DB
-       {:schema        schema
-        :rschema       (#'db/rschema (merge db/implicit-schema schema))
-        :eavt          (set/from-sorted-array db/cmp-datoms-eavt eavt)
-        :aevt          (set/from-sorted-array db/cmp-datoms-aevt aevt)
-        :avet          (set/from-sorted-array db/cmp-datoms-avet avet)
-        :max-eid       (dict-get from "max-eid")
-        :max-tx        (dict-get from "max-tx")
-        :pull-patterns (lru/cache 100)
-        :pull-attrs    (lru/cache 100)
-        :hash          (atom 0)}))))
+     (db/restore-db
+       {:schema  schema
+        :eavt    (set/from-sorted-array db/cmp-datoms-eavt eavt)
+        :aevt    (set/from-sorted-array db/cmp-datoms-aevt aevt)
+        :avet    (set/from-sorted-array db/cmp-datoms-avet avet)
+        :max-eid (dict-get from "max-eid")
+        :max-tx  (dict-get from "max-tx")}))))