Version 1.5.2

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.5.2
+
+- JVM: Fixed `d/collect-garbage`
+- JVM: Return nil instead of throwing from `d/restore` if there is no db
+
 # 1.5.1
 
 - CLJS: Fixed shadow-cljs warning

README.md

@@ -18,7 +18,7 @@ The intention with DataScript is to be a basic building block in client-side app
 ## Latest version [![Build Status](https://travis-ci.org/tonsky/datascript.svg?branch=master)](https://travis-ci.org/tonsky/datascript)
 
 ```clj
-[datascript "1.5.1"]
+[datascript "1.5.2"]
 ```
 
 Important! If you are using shadow-cljs, add
@@ -176,7 +176,7 @@ For more examples, see [our acceptance test suite](test/datascript/test/).
 DataScript can be used from any JS engine without additional dependencies:
 
 ```html
-<script src="https://github.com/tonsky/datascript/releases/download/1.5.1/datascript-1.5.1.min.js"></script>
+<script src="https://github.com/tonsky/datascript/releases/download/1.5.2/datascript-1.5.2.min.js"></script>
 ```
 
 or as a CommonJS module ([npm page](https://www.npmjs.org/package/datascript)):

project.clj

@@ -1,4 +1,4 @@
-(def version "1.5.1")
+(def version "1.5.2")
 
 (defproject datascript (str version (System/getenv "DATASCRIPT_CLASSIFIER"))
   :description "An implementation of Datomic in-memory database and Datalog query engine in ClojureScript"

release-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datascript",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Immutable in-memory triplestore with Datalog queries",
   "homepage": "https://github.com/tonsky/datascript",
   "author": "Nikita Prokopov (https://github.com/tonsky)",

release-js/wrapper.prefix

@@ -1,5 +1,5 @@
 /**
- * Datascript v1.5.1
+ * Datascript v1.5.2
  *
  * Copyright 2014-2021 Nikita Prokopov
  *

src/datascript/storage.clj

@@ -126,21 +126,21 @@
 
 (defn restore-impl [storage opts]
   (locking storage
-    (let [root (-restore storage root-addr)
-          tail (-restore storage tail-addr)
-          {:keys [schema eavt aevt avet max-eid max-tx max-addr]} root
-          _       (vswap! *max-addr max max-addr)
-          opts    (merge root opts)
-          adapter (make-storage-adapter storage opts)
-          db      (db/restore-db
-                    {:schema  schema
-                     :eavt    (set/restore-by db/cmp-datoms-eavt eavt adapter opts)
-                     :aevt    (set/restore-by db/cmp-datoms-aevt aevt adapter opts)
-                     :avet    (set/restore-by db/cmp-datoms-avet avet adapter opts)
-                     :max-eid max-eid
-                     :max-tx  max-tx})]
-      (remember-db db)
-      [db (mapv #(mapv (fn [[e a v tx]] (db/datom e a v tx)) %) tail)])))
+    (when-some [root (-restore storage root-addr)]
+      (let [tail    (-restore storage tail-addr)
+            {:keys [schema eavt aevt avet max-eid max-tx max-addr]} root
+            _       (vswap! *max-addr max max-addr)
+            opts    (merge root opts)
+            adapter (make-storage-adapter storage opts)
+            db      (db/restore-db
+                      {:schema  schema
+                       :eavt    (set/restore-by db/cmp-datoms-eavt eavt adapter opts)
+                       :aevt    (set/restore-by db/cmp-datoms-aevt aevt adapter opts)
+                       :avet    (set/restore-by db/cmp-datoms-avet avet adapter opts)
+                       :max-eid max-eid
+                       :max-tx  max-tx})]
+        (remember-db db)
+        [db (mapv #(mapv (fn [[e a v tx]] (db/datom e a v tx)) %) tail)]))))
 
 (defn db-with-tail [db tail]
   (reduce
@@ -162,14 +162,14 @@
     (.walkAddresses ^PersistentSortedSet (:aevt db) visit-fn)
     (.walkAddresses ^PersistentSortedSet (:avet db) visit-fn)))
 
-(defn ^HashSet addresses [dbs]
-  (let [set      (HashSet.)
-        visit-fn #(.add set %)]
-    (.add set root-addr)
-    (.add set tail-addr)
+(defn addresses [dbs]
+  (let [*set     (volatile! (transient #{}))
+        visit-fn #(vswap! *set conj! %)]
+    (visit-fn root-addr)
+    (visit-fn tail-addr)
     (doseq [db dbs]
       (addresses-impl db visit-fn))
-    set))
+    (persistent! @*set)))
 
 (defn- read-stored-dbs [storage']
   (let [iter ^Iterator (.iterator stored-dbs)]
@@ -198,7 +198,7 @@
                    (restore storage')) ;; make sure we won’t gc currently stored db
           used   (addresses dbs)
           all    (-list-addresses storage')
-          unused (into [] (remove #(.contains used %)) all)]
+          unused (into [] (remove used) all)]
       (util/log "GC: found" (count dbs) "alive db refs," (count used) "used addrs," (count all) "total addrs," (count unused) "unused")
       (-delete storage' unused))))
 

test/datascript/test/storage.clj

@@ -197,7 +197,6 @@
                 (is (= (:avet db) (:avet db')))))))))))
 
 (deftest test-gc
-  (Thread/sleep 10000)
   (let [storage (make-storage)]
     (let [db (large-db {:storage storage})]
       (d/store db)