use transient sets during transaction

Author: tonsky

dev/user.clj

@@ -65,7 +65,10 @@
   (let [class (.getClassName e)]
     (when (and (not (str/starts-with? class "clojure."))
                (not (str/starts-with? class "nrepl."))
-               (not (str/starts-with? class "java.")))
+               (not (str/starts-with? class "java."))
+               (not (str/starts-with? class "user$"))
+               (not (str/starts-with? class "user/"))
+               (not (str/starts-with? class "leiningen.")))
       (print prefix)
       (let [method     (.getMethodName e)
             [_ ns fun] (re-matches #"([A-Za-z0-9_.-]+)\$([A-Za-z0-9_.-]+)" (str class))]

src-java/datascript/SortedSet.java

@@ -3,25 +3,6 @@
 import java.util.*;
 import clojure.lang.*;
 
-/**
-*   8 max      16 max      32 max      64 max      128 max      256 max      512 max      1024 max
-*   
-*   100K ADDs
-*   23..30ms    19..21ms    19..23ms    19..22ms    19..22ms    20..22ms    21..29ms    24..28ms    
-*   
-*   100K CONTAINS
-*   17..18ms    13..15ms    14..16ms    14..16ms    14..16ms    15..17ms    15..17ms    15..17ms    
-*   
-*   ITERATE over 1M
-*   17..18ms    10..12ms     8..10ms     6.. 8ms     6.. 7ms     5.. 7ms     5.. 6ms     5..18ms    
-*   
-*   SEQ ITER over 1M
-*   21..24ms    17..26ms    16..23ms    14..21ms    14..20ms    14..20ms    13..18ms    13..18ms    
-*   
-*   100K REMOVEs
-*   27..31ms    21..22ms    19..21ms    18..19ms    18..20ms    18..21ms    18..19ms    20..29ms    
-*/
-
 @SuppressWarnings("unchecked")
 public class SortedSet extends ASortedSet implements IEditableCollection, ITransientSet, Reversible, Sorted, IReduce, ISortedSet {
 
@@ -64,6 +45,11 @@ public SortedSet(IPersistentMap meta, Comparator cmp) {
     _edit  = edit;
   }
 
+  void ensureEditable(boolean value) {
+    if (value != _edit.editable())
+      throw new RuntimeException("Expected" + (value ? " transient" : " persistent") + "set");
+  }
+
   // ISortedSet
   public Seq slice(Object from, Object to) { return slice(from, to, _cmp); }
   public Seq slice(Object from, Object to, Comparator cmp) {
@@ -243,15 +229,17 @@ public boolean contains(Object key) {
 
   // IEditableCollection
   public SortedSet asTransient() {
+    ensureEditable(false);
     return new SortedSet(_meta, _cmp, _root, _count, new Edit(true));
   }
 
   // ITransientCollection
   public SortedSet conj(Object key) {
-    return cons(key);
+    return cons(key, _cmp);
   }
 
   public SortedSet persistent() {
+    ensureEditable(true);
     _edit.setEditable(false);
     return this;
   }

src/datascript/btset.clj

@@ -3,6 +3,7 @@
   datascript.btset
   (:refer-clojure :exclude [iter])
   (:import
+    [java.util Comparator]
     [datascript SortedSet]))
 
 (defn btset-conj [set key cmp]
@@ -20,18 +21,18 @@
   ([set from to]
     (.slice ^SortedSet set from to))
   ([set from to cmp]
-    (.slice ^SortedSet set from to cmp)))
+    (.slice ^SortedSet set from to ^Comparator cmp)))
 
 (defn rslice
   "`(rslice set from to)` returns backwards iterator for all Xs where from <= X <= to.
    `(rslice set from nil)` returns backwards iterator for all Xs where X <= from."
   ([set from to]
     (.rslice ^SortedSet set from to))
   ([set from to cmp]
-    (.rslice ^SortedSet set from to cmp)))
+    (.rslice ^SortedSet set from to ^Comparator cmp)))
 
 (defn btset-by
-  ([cmp] (SortedSet. cmp))
+  ([cmp] (SortedSet. ^Comparator cmp))
   ([cmp & keys]
     (into (btset-by cmp) keys)))
 

src/datascript/db.cljc

@@ -393,6 +393,18 @@
 (declare hash-db hash-fdb equiv-db empty-db resolve-datom validate-attr components->pattern indexing?)
 #?(:cljs (declare pr-db))
 
+(defn db-transient [db]
+  (-> db
+    (update :eavt transient)
+    (update :aevt transient)
+    (update :avet transient)))
+
+(defn db-persistent! [db]
+  (-> db
+    (update :eavt persistent!)
+    (update :aevt persistent!)
+    (update :avet persistent!)))
+
 (defrecord-updatable DB [schema eavt aevt avet max-eid max-tx rschema hash]
   #?@(:cljs
       [IHash                (-hash  [db]        (hash-db db))
@@ -401,7 +413,10 @@
        IReversible          (-rseq  [db]        (-rseq (.-eavt db)))
        ICounted             (-count [db]        (count (.-eavt db)))
        IEmptyableCollection (-empty [db]        (empty-db (.-schema db)))
-       IPrintWithWriter     (-pr-writer [db w opts] (pr-db db w opts))]
+       IPrintWithWriter     (-pr-writer [db w opts] (pr-db db w opts))
+       IEditableCollection  (-as-transient [db] (db-transient db))
+       ITransientCollection (-conj! [db key] (throw (ex-info "datascript.DB/conj! is not supported" {})))
+                            (-persistent! [db] (db-persistent! db))]
 
       :clj
       [Object               (hashCode [db]      (hash-db db))
@@ -410,7 +425,12 @@
        clojure.lang.IPersistentCollection
                             (count [db]         (count eavt))
                             (equiv [db other]   (equiv-db db other))
-                            (empty [db]         (empty-db schema))])
+                            (empty [db]         (empty-db schema))
+       clojure.lang.IEditableCollection 
+                            (asTransient [db] (db-transient db))
+       clojure.lang.ITransientCollection
+                            (conj [db key] (throw (ex-info "datascript.DB/conj! is not supported" {})))
+                            (persistent [db] (db-persistent! db))])
 
   IDB
   (-schema [db] (.-schema db))
@@ -1106,16 +1126,18 @@
                 (sequential? initial-es))
     (raise "Bad transaction data " initial-es ", expected sequential collection"
            {:error :transact/syntax, :tx-data initial-es}))
-  (loop [report initial-report
+  (loop [report (-> initial-report
+                  (update :db-after transient))
          es     initial-es]
     (let [[entity & entities] es
-          db (:db-after report)
-          {:keys [tempids]} report]
+          db                  (:db-after report)
+          {:keys [tempids]}   report]
       (cond
         (empty? es)
         (-> report
             (assoc-in  [:tempids :db/current-tx] (current-tx report))
-            (update-in [:db-after :max-tx] inc))
+            (update-in [:db-after :max-tx] inc)
+            (update :db-after persistent!))
 
         (nil? entity)
         (recur report entities)

test/datascript/test/btset.cljc

@@ -2,7 +2,9 @@
   (:require
     [datascript.btset :as btset]
     #?(:cljs [cljs.test    :as t :refer-macros [is are deftest testing]]
-       :clj  [clojure.test :as t :refer        [is are deftest testing]])))
+       :clj  [clojure.test :as t :refer        [is are deftest testing]]))
+  #?(:clj
+     (:import [clojure.lang IReduce])))
 
 
 #?(:cljs (enable-console-print!))
@@ -266,8 +268,8 @@
 
 
 (defn ireduce
-  ([f coll] (#?(:clj .reduce :cljs -reduce) coll f))
-  ([f val coll] (#?(:clj .reduce :cljs -reduce) coll f val)))
+  ([f coll] (#?(:clj .reduce :cljs -reduce) ^IReduce coll f))
+  ([f val coll] (#?(:clj .reduce :cljs -reduce) ^IReduce coll f val)))
 
 
 (defn reduce-chunked [f val coll]