Version 0.11.5

tonsky · Jun 28, 2015 · 1457c2a · 1457c2a
1 parent d174467
commit 1457c2a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.11.5
+
+- Ported BTSet to JVM
+- BTSet and BTSetIter implement ChunkedSeq
+- New benchmark runner
+
 # 0.11.4
 
 Experimental support for Clojure on JVM:

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ For more examples, see [our acceptance test suite](test/datascript/test/).
 :dependencies [
   [org.clojure/clojure "1.7.0-beta2"]
   [org.clojure/clojurescript "0.0-3291"]
-  [datascript "0.11.4"]
+  [datascript "0.11.5"]
 ]
 ```
 
@@ -126,7 +126,7 @@ _Note:_ DataScript 0.11.0 and later will only work with CLJS 0.0-3196 and later
 DataScript can be used from any JS engine without additional dependencies:
 
 ```html
-<script src="https://github.com/tonsky/datascript/releases/download/0.11.4/datascript-0.11.4.min.js"></script>
+<script src="https://github.com/tonsky/datascript/releases/download/0.11.5/datascript-0.11.5.min.js"></script>
 ```
 
 or as a CommonJS module ([npm page](https://www.npmjs.org/package/datascript)):

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject datascript "0.11.4"
+(defproject datascript "0.11.5"
   :description "An implementation of Datomic in-memory database and Datalog query engine in ClojureScript"
   :license {:name "Eclipse"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

diff --git a/release-js/package.json b/release-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datascript",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "Immutable in-memory triplestore with Datalog queries",
   "homepage": "https://github.com/tonsky/datascript",
   "author": "Nikita Prokopov (https://github.com/tonsky)",

diff --git a/release-js/wrapper.prefix b/release-js/wrapper.prefix
@@ -1,5 +1,5 @@
 /**
- * Datascript v0.11.4
+ * Datascript v0.11.5
  *
  * Copyright 2014-2015 Nikita Prokopov
  *

diff --git a/src/datascript/btset.cljc b/src/datascript/btset.cljc
@@ -40,11 +40,11 @@
 (def ^:const max-len 32)
 (def ^:const avg-len (shim/half (+ max-len min-len)))
 (def ^:const level-shift (->> (range 31 -1 -1)
-                              (filter #(bit-test (dec max-len) %))
+                              (filter #(bit-test max-len %))
                               first
                               inc))
 (def ^:const path-mask (dec (bit-shift-left 1 level-shift)))
-(def ^:const ^long empty-path (long 0))
+(def ^:const ^long empty-path 0)
 
 (defn path-get ^long [^long path ^long level]
   (bit-and path-mask