Fixed regression when transient indexes were mutated and iterated during single tx (closes #294)

Author: tonsky

.gitignore

@@ -23,4 +23,5 @@ dev/playground.clj
 TODO.txt
 .cljs_node_repl
 node_modules
-package-lock.json
+package-lock.json
+reading

CHANGELOG.md

@@ -1,3 +1,8 @@
+# WIP
+
+- Fixed regression when transient indexes were mutated and iterated during single tx (#294)
+- Bumped persistent-sorted-set to 0.1.2 (throw if transient set is mutated and iterated at the same time)
+
 # 0.18.1
 
 - Bumped persistent-sorted-set to 0.1.1 (Java 8 bytecode)

deps.edn

@@ -1,6 +1,6 @@
 { 
   :deps {
-    persistent-sorted-set {:mvn/version "0.1.0"}
+    persistent-sorted-set {:mvn/version "0.1.2"}
   }
 
   :aliases {
@@ -19,24 +19,24 @@
     :dev {
       :extra-paths ["dev" "target/classes"]
       :extra-deps {
-        org.clojure/clojurescript {:mvn/version "1.10.516"}
+        org.clojure/clojurescript {:mvn/version "1.10.520"}
         org.clojure/tools.namespace {:mvn/version "0.2.11"}
       }
     }
 
     :test {
       :extra-paths ["test"]
       :extra-deps {
-        org.clojure/clojurescript {:mvn/version "1.10.516"}
+        org.clojure/clojurescript {:mvn/version "1.10.520"}
         lambdaisland/kaocha       {:mvn/version "0.0-389"}
-        lambdaisland/kaocha-cljs  {:mvn/version "0.0-16"}
+        lambdaisland/kaocha-cljs  {:mvn/version "0.0-21"}
       }
     }
 
     :repl {
       :extra-deps {
-        cider/cider-nrepl           {:mvn/version "0.19.0"}
-        nrepl/nrepl                 {:mvn/version "0.5.3"}
+        cider/cider-nrepl           {:mvn/version "0.21.1"}
+        nrepl/nrepl                 {:mvn/version "0.6.0"}
         org.clojure/tools.namespace {:mvn/version "0.2.11"}
       }
       :main-opts [

dev/user.clj

@@ -46,9 +46,13 @@
     (clojure.test/test-vars [var])
     @clojure.test/*report-counters*))
 
+(defn retest-ns [ns]
+  (clojure.tools.namespace.repl/refresh)
+  (clojure.test/test-ns ns))
+
 (defn retest-all []
   (clojure.tools.namespace.repl/refresh)
-  (clojure.test/run-all-tests #"datascript\.test\."))
+  (clojure.test/run-all-tests #"datascript\.test\..*"))
 
 #_(retest-all)
 

project.clj

@@ -8,8 +8,8 @@
 
   :dependencies [
     [org.clojure/clojure       "1.10.0"   :scope "provided"]
-    [org.clojure/clojurescript "1.10.516" :scope "provided"]
-    [persistent-sorted-set     "0.1.1"]
+    [org.clojure/clojurescript "1.10.520" :scope "provided"]
+    [persistent-sorted-set     "0.1.2"]
   ]
 
   :plugins [
@@ -94,7 +94,7 @@
            :dependencies [[org.clojure/tools.nrepl     "0.2.13"]
                           [org.clojure/tools.namespace "0.2.11"]
                           [lambdaisland/kaocha         "0.0-389"]
-                          [lambdaisland/kaocha-cljs    "0.0-16"]] }
+                          [lambdaisland/kaocha-cljs    "0.0-21"]] }
     :aot { :aot [#"datascript\.(?!query-v3).*"]
            :jvm-opts ["-Dclojure.compiler.direct-linking=true"] }
   }

src/datascript/db.cljc

@@ -98,7 +98,7 @@
             (->> form
                  dedupe-interfaces
                  (remove (fn [method]
-                           (when-let [impl (-> method get-sig impl-map)]
+                           (when-some [impl (-> method get-sig impl-map)]
                              (not= method impl)))))
             form))
         body))))
@@ -860,7 +860,7 @@
 (defn validate-datom [db ^Datom datom]
   (when (and (datom-added datom)
              (is-attr? db (.-a datom) :db/unique))
-    (when-let [found (not-empty (-datoms db :avet [(.-a datom) (.-v datom)]))]
+    (when-some [found (not-empty (-datoms db :avet [(.-a datom) (.-v datom)]))]
       (raise "Cannot add " datom " because of unique constraint: " found
              {:error :transact/unique
               :attribute (.-a datom)
@@ -991,7 +991,7 @@
 
 
 (defn- upsert-eid [db entity]
-  (when-let [idents (not-empty (-attrs-by db :db.unique/identity))]
+  (when-some [idents (not-empty (-attrs-by db :db.unique/identity))]
     (->>
       (reduce-kv
         (fn [acc a v] ;; acc = [e a v]
@@ -1217,7 +1217,7 @@
                   ov (if (ref? db a) (entid-strict db ov) ov)
                   nv (if (ref? db a) (entid-strict db nv) nv)
                   _ (validate-val nv entity)
-                  datoms (-search db [e a])]
+                  datoms (vec (-search db [e a]))]
               (if (multival? db a)
                 (if (some (fn [^Datom d] (= (.-v d) ov)) datoms)
                   (recur (transact-add report [:db/add e a nv]) entities)
@@ -1245,7 +1245,7 @@
                   (recur (allocate-eid report e eid) (cons [op eid a v] entities)))))
 
             (and (ref? db a) (tempid? v))
-            (if-let [vid (get tempids v)]
+            (if-some [vid (get tempids v)]
               (recur report (cons [op e a vid] entities))
               (recur (allocate-eid report v (next-eid db)) es))
 
@@ -1263,18 +1263,18 @@
               (recur report entities))
 
             (= op :db.fn/retractAttribute)
-            (if-let [e (entid db e)]
-              (let [_ (validate-attr a entity)
-                    datoms (-search db [e a])]
+            (if-some [e (entid db e)]
+              (let [_      (validate-attr a entity)
+                    datoms (vec (-search db [e a]))]
                 (recur (reduce transact-retract-datom report datoms)
                        (concat (retract-components db datoms) entities)))
               (recur report entities))
 
             (or (= op :db.fn/retractEntity)
                 (= op :db/retractEntity))
-            (if-let [e (entid db e)]
-              (let [e-datoms (-search db [e])
-                    v-datoms (mapcat (fn [a] (-search db [nil a e])) (-attrs-by db :db.type/ref))]
+            (if-some [e (entid db e)]
+              (let [e-datoms (vec (-search db [e]))
+                    v-datoms (vec (mapcat (fn [a] (-search db [nil a e])) (-attrs-by db :db.type/ref)))]
                 (recur (reduce transact-retract-datom report (concat e-datoms v-datoms))
                        (concat (retract-components db e-datoms) entities)))
               (recur report entities))

src/datascript/query.cljc

@@ -1,4 +1,4 @@
-(ns datascript.query
+(ns ^:no-doc datascript.query
   (:require
    [#?(:cljs cljs.reader :clj clojure.edn) :as edn]
    [clojure.set :as set]

test/datascript/test/transact.cljc

@@ -299,3 +299,19 @@
           (is (= tx-id (+ d/tx0 3)))
           (is (= (into {} (d/entity @conn tx-id))
                  {:prop4 "prop4"})))))))
+
+
+(deftest test-transient-294
+  "db.fn/retractEntity retracts attributes of adjacent entities https://github.com/tonsky/datascript/issues/294"
+  (let [db (reduce #(d/db-with %1 [{:db/id %2 :a1 1 :a2 2 :a3 3}])
+             (d/empty-db)
+             (range 1 10))
+        report (d/with db [[:db.fn/retractEntity 1]
+                           [:db.fn/retractEntity 2]])]
+    (is (= [(d/datom 1 :a1 1)
+            (d/datom 1 :a2 2)
+            (d/datom 1 :a3 3)
+            (d/datom 2 :a1 1)
+            (d/datom 2 :a2 2)
+            (d/datom 2 :a3 3)] 
+           (:tx-data report)))))