Extracted btset to

Author: tonsky

CHANGELOG.md

@@ -1,7 +1,53 @@
 # WIP
 
+- Fixed DB and Datom pprinting (#287) 
 - Fixed cases when upsert resolves to tempid (#285)
-- Throw on tempid in `:db.fn/cas` (closes #264)
+- Throw on tempid in `:db.fn/cas` (#264)
+- `distinct` aggregate returns set not a vector (thx @jdf-id-au)
+- Ability to run tests with Kaocha
+- [ BREAKING ] Some internals of `datascript.arrays`, `datascript.btset` and `datascript.Datom` type has changed
+
+Performance optimizations for JVM version:
+  
+- Reimplemented btset in Java with transients and better performance
+- Extracted btset to `[persistent-sorted-set "0.1.0"]` 
+- Used raw ints in Datom intead of wrapped Integers, added stored in tx sign
+
+Numbers I get on my 3.2 GHz i7-8700B (median time per test, ms):
+
+| version          | add-1   | add-5 | add-all | init | retract-5 | q1  | q2   | q3   | q4   | qpred1 | qpred2 |
+|------------------|---------|-------|---------|------|-----------|-----|------|------|------|--------|--------|
+| 0.17.1-jvm       | 795.8   | 670.7 | 651.8   | 79.4 | 617.5     | 2.3 | 5.4  | 8.2  | 13.1 | 7.1    | 27.3   |
+| 0.18.0-jvm       | 625.2   | 450.9 | 401.8   | 21.8 | 389.5     | 1.9 | 5.4  | 8.2  | 13.3 | 7.3    | 28.9   |
+| 0.9.5703-datomic | 1693.9  | 737.9 | 528.5   | ---  | 1420.9    | 2.8 | 5.2  | 7.3  | 9.3  | 12.8   | 15.5   |
+| 0.18.0-v8        | 1231.6  | 963.1 | 930.3   | 76.5 | 809.1     | 6.4 | 15.2 | 23.8 | 33.6 | 24.2   | 24.5   |
+
+Tests are as follows:
+
+| Test      | Description |
+|-----------|-------------|
+| add-1     | Add 100k datoms to an empty DB, one datom per transaction |
+| add-5     | Add 20k entities to an empty DB, 5 datoms per transaction, 100k datoms total |
+| add-all   | Add 20k entities to an empty DB in a single transaction, 100k datoms total |
+| init      | “Fast” datascript DB creation from an already sorted array of datoms (used in DB deserialization), 100k datoms |
+| retract-5 | Retract 20k entities from a DB with 100k datoms. Each entity removes 5 datoms. 1 entity per tx. |
+| q1        | Query with 1 clause over a DB with 100k datoms, ~12k tuples in resultset `[:find ?e :where [?e :name "Ivan"]]` |
+| q2        | Query with 2 clauses, 1 join, ~12k tuples `[:find ?e ?a :where [?e :name "Ivan"] [?e :age ?a]]` |
+| q3        | Query with 3 clauses, 2 joins, ~6k tuples `[:find ?e ?a :where [?e :name "Ivan"] [?e :age ?a] [?e :sex :male]]` |
+| q4        | Query with 4 clauses, 3 joins, ~6k tuples `[:find ?e ?l ?a :where [?e :name "Ivan"] [?e :last-name ?l] [?e :age ?a] [?e :sex :male]]` |
+| qpred1    | Query with a predicate, ~50k tuples `[:find ?e ?s :where [?e :salary ?s] [(> ?s 50000)]]` |
+| qpred2    | Query with a predicate and dynamic input, ~50k tuples `[:find ?e ?s :in $ ?min_s :where [?e :salary ?s] [(> ?s ?min_s)]]` |
+
+For Datomic an `datomic:mem://` database was used.
+
+What we see:
+
+- 20..40% faster transactions,
+- 75% faster deserialization (db-init),
+- No significant change on queries,
+- JVM transactions are more than twice as fast as V8,
+- JVM queries are 3-4 times as fast as V8,
+- DataScript transactions are 25..70% faster that Datomic in-memory. Query times vary.
 
 # 0.17.1
 

bench/bench.clj

@@ -55,14 +55,14 @@
         (= "rebuild" arg)
         (recur (assoc opts :rebuild true) (next args))
 
-        (re-matches #"(jvm|v8|dtmc)" arg)
+        (re-matches #"(jvm|v8|datomic)" arg)
         (recur (update opts :versions conj ["latest" arg]) (next args))
 
         (re-matches #"(\d+\.\d+\.\d+|[0-9a-fA-F]{40}|latest)" arg)
         (recur (update opts :versions conj [arg "jvm"]) (next args))
 
-        (re-matches #"(\d+\.\d+\.\d+|[0-9a-fA-F]{40}|latest)-(jvm|v8|dtmc)" arg)
-        (let [[_ version vm] (re-matches #"(\d+\.\d+\.\d+|[0-9a-fA-F]{40}|latest)-(jvm|v8|dtmc)" arg)]
+        (re-matches #"(\d+\.\d+\.\d+|[0-9a-fA-F]{40}|latest)-(jvm|v8|datomic)" arg)
+        (let [[_ version vm] (re-matches #"(\d+\.\d+\.\d+|[0-9a-fA-F]{40}|latest)-(jvm|v8|datomic)" arg)]
           (recur (update opts :versions conj [version vm]) (next args)))
 
         :else
@@ -76,23 +76,26 @@
     (apply run "clojure" "-Sdeps"
       (cond
         (= "latest" version)
-        "{:paths [\"src\" \"../src\" \"../target/classes\"]}"
+        (str "{:paths [\"src\"]"
+          "    :deps {datascript {:local/root \"..\"}}}")
 
         (re-matches #"\d+\.\d+\.\d+" version)
-        (str "{:deps {datascript {:mvn/version \"" version "\"}}}")
+        (str "{:paths [\"src\"]"
+          "    :deps {datascript {:mvn/version \"" version "\"}}}")
 
         (re-matches #"[0-9a-fA-F]{40}" version)
-        (str "{:paths [\"src\" \"../target/classes\"] :deps {datascript {:git/url \"https://github.com/tonsky/datascript.git\" :sha \"" version "\"}}}"))
+        (str "{:paths [\"src\"]"
+          "    :deps {datascript {:git/url \"https://github.com/tonsky/datascript.git\" :sha \"" version "\"}}}"))
       "-m" "datascript-bench.datascript"
       benchmarks)
 
     "v8"
     (apply run "node" "run_v8.js" benchmarks)
 
-    "dtmc"
+    "datomic"
     (apply run "clojure" "-Sdeps"
       (str "{"
-        " :paths [\"src\" \"src-dtmc\"]"
+        " :paths [\"src\" \"src-datomic\"]"
         " :deps {com.datomic/datomic-free {:mvn/version \"" (if (= "latest" version) "0.9.5703" version) "\"}}"
         "}")
       "-m" "datascript-bench.datomic"

…ch/src-dtmc/datascript_bench/datomic.clj …src-datomic/datascript_bench/datomic.cljbench/src-dtmc/datascript_bench/datomic.clj renamed to bench/src-datomic/datascript_bench/datomic.clj bench/src-dtmc/datascript_bench/datomic.clj renamed to bench/src-datomic/datascript_bench/datomic.clj

@@ -2,17 +2,19 @@
   (:require
     [clojure.string :as str]
     [datascript.core :as d]
-    [datascript.btset :as btset]
     [datascript-bench.core :as core]
     [datascript.query-v3 :as q3]))
 
+
 #?(:cljs
    (enable-console-print!))
 
+
 (def schema
   { :follows { :db/valueType   :db.type/ref
                :db/cardinality :db.cardinality/many } })
 
+
 (defn- wide-db
   ([depth width] (d/db-with (d/empty-db schema) (wide-db 1 depth width)))
   ([id depth width]
@@ -26,6 +28,7 @@
           (mapcat #(wide-db % (dec depth) width) children)))
       [{:db/id id :name "Ivan"}])))
 
+
 (defn- long-db [depth width]
   (d/db-with (d/empty-db schema)
     (apply concat
@@ -156,30 +159,6 @@
               [?x :follows ?t]
               (follows ?t ?y)]]))))
 
-; (defn ^:export bench-btset []
-;   (doseq [[tn target] [["sorted-set" (sorted-set)]
-;                        ["vector"     []]
-;                        ["btset"      (btset/btset)]]
-; ;;           distinct?   [true false]
-;           size        [100 500 20000]
-;           :let [range          (if true ;; distinct?
-;                                  (shuffle (range size))
-;                                  (repeatedly size #(rand-int size)))
-;                 shuffled-range (shuffle range)
-;                 set            (into target range)]]
-;     (core/bench {:target tn :test "set-conj" :size size}
-;       (into target range))
-;     (when (re-find #"set" tn)
-;       (core/bench {:target tn :test "set-disj" :size size}
-;         (reduce disj set shuffled-range))
-;       (core/bench {:target tn :test "set-lookup" :size size}
-;         (doseq [i shuffled-range]
-;           (contains? set i))))
-;     (core/bench {:target tn :test "set-iterate" :size size}
-;       (doseq [x set]
-;         (+ 1 x)))
-;     (core/bench {:target tn :test "set-reduce" :size size}
-;       (reduce + 0 set))))
 
 #?(:clj
    (defn ^:export -main [& names]

bench/src/datascript_bench/datascript.cljc

@@ -1,4 +1,9 @@
-{ :aliases {
+{ 
+  :deps {
+    persistent-sorted-set {:mvn/version "0.1.0"}
+  }
+  
+  :aliases {
     :1.9 {
       :override-deps {
         org.clojure/clojure {:mvn/version "1.9.0"}

deps.edn

@@ -48,7 +48,7 @@
 
 (defn retest-all []
   (clojure.tools.namespace.repl/refresh)
-  (clojure.test/run-all-tests #"datascript\.test\.(?!btset).*"))
+  (clojure.test/run-all-tests #"datascript\.test\."))
 
 #_(retest-all)
 

dev.html

@@ -9,34 +9,31 @@
   :dependencies [
     [org.clojure/clojure       "1.10.0"   :scope "provided"]
     [org.clojure/clojurescript "1.10.516" :scope "provided"]
+    [persistent-sorted-set     "0.1.0"]
   ]
 
   :plugins [
     [lein-cljsbuild "1.1.7"]
-    ; [lein-virgil "0.1.9"]
   ]
 
   :global-vars {
     *warn-on-reflection*   true
     *print-namespace-maps* false
 ;;     *unchecked-math* :warn-on-boxed
   }
-  :java-source-paths ["src-java"]  
   :jvm-opts ["-Xmx2g" "-server"]
 
-  :aliases {"test-clj"     ["run" "-m" "datascript.test/test-most"]
-            "test-clj-all" ["run" "-m" "datascript.test/test-all"]
+  :aliases {"test-clj"     ["run" "-m" "datascript.test/test-clj"]
+            "test-cljs"    ["do" ["cljsbuild" "once" "release" "advanced"]
+                                 ["run" "-m" "datascript.test/test-node" "--all"]]
             "node-repl"    ["run" "-m" "user/node-repl"]
             "browser-repl" ["run" "-m" "user/browser-repl"]
-            "test-all"     ["do" ["clean"]
-                                 ["test-clj-all"]
-                                 ["cljsbuild" "once" "release" "advanced"]
-                                 ["run" "-m" "datascript.test/test-node" "--all"]]}
+            "test-all"     ["do" ["clean"] ["test-clj"] ["test-cljs"]]}
 
   :cljsbuild { 
     :builds [
       { :id "release"
-        :source-paths ["src" "bench/src"]
+        :source-paths ["src"]
         :assert false
         :compiler {
           :output-to     "release-js/datascript.bare.js"
@@ -50,7 +47,7 @@
         :notify-command ["release-js/wrap_bare.sh"]}
 
       { :id "advanced"
-        :source-paths ["src" "bench/src" "test"]
+        :source-paths ["src" "test"]
         :compiler {
           :output-to     "target/datascript.js"
           :optimizations :advanced
@@ -77,7 +74,7 @@
         }}
 
       { :id "none"
-        :source-paths ["src" "bench/src" "test" "dev"]
+        :source-paths ["src" "test"]
         :compiler {
           :main          datascript.test
           :output-to     "target/datascript.js"
@@ -93,7 +90,7 @@
   :profiles {
     :1.9 { :dependencies [[org.clojure/clojure         "1.9.0"   :scope "provided"]
                           [org.clojure/clojurescript   "1.9.946" :scope "provided"]] }
-    :dev { :source-paths ["bench/src" "test" "dev"]
+    :dev { :source-paths ["test" "dev"]
            :dependencies [[org.clojure/tools.nrepl     "0.2.13"]
                           [org.clojure/tools.namespace "0.2.11"]
                           [lambdaisland/kaocha         "0.0-389"]