Merge branch 'master' of github.com:dgrnbrg/hitchhiker-tree

Author: dgrnbrg

README.md

@@ -6,7 +6,7 @@ Hitchhiker trees are a newly invented (by @dgrnbrg) datastructure, synthesizing
 
 The hitchhiker namespaces contain a complete implementation of a persistent, serializable, lazily-loaded hitchhiker tree.
 This is a sorted key-value datastructure, like a scalable `sorted-map`.
-It can incrementally persist and automatically lazily load itself from any backing storewhich implements a simple protocol.
+It can incrementally persist and automatically lazily load itself from any backing store which implements a simple protocol.
 
 Outboard is a sample application for the hitchhiker tree.
 It includes an implementation of the IO subsystem backed by Redis, and it manages all of the incremental serialization and flushing.

doc/hitchhiker.adoc

@@ -138,8 +138,8 @@ In `hitchhiker.tree.core`, we have several important protocols:
 
 === Related Work
 
-Hitchhiker trees are made persistent with the same method, path copying, [as used by Okasaki](https://www.cs.cmu.edu/~rwh/theses/okasaki.pdf)
-The improved write performance is made possible thanks to the same buffering technique as a [fractal tree index](https://en.wikipedia.org/wiki/Fractal_tree_index).
+Hitchhiker trees are made persistent with the same method, path copying, https://www.cs.cmu.edu/~rwh/theses/okasaki.pdf[as used by Okasaki]
+The improved write performance is made possible thanks to the same buffering technique as a https://en.wikipedia.org/wiki/Fractal_tree_index[fractal tree index].
 As it turns out, after I implemented the fractal tree, I spoke with a former employee of Tokutek, a company that commercialized fractal tree indices.
 That person told me that we'd actually implemented fractal reads identically!
 This is funny because there's no documentation anywhere about how exactly you should structure your code to compute the query.

src/hitchhiker/bench.clj env/profiling/hitchhiker/bench.cljsrc/hitchhiker/bench.clj renamed to env/profiling/hitchhiker/bench.clj

@@ -79,7 +79,7 @@
             tree' (if inserting?
                     (insert (or flushed-tree tree) x x)
                     (delete (or flushed-tree tree) x))
-            after (System/nanoTime) 
+            after (System/nanoTime)
             log-inserts (zero? (mod i' (quot n 100)))
             updated-outputs (atom outputs)]
         (when log-inserts ;; 1000 pieces
@@ -129,7 +129,7 @@
     :validate [#(#{"fractal" "b-tree" "sorted-set"} %) "Data structure must be fractal, b-tree, or sorted set"]]
    [nil "--backend testing" "Runs the benchmark with the specified backend"
     :default "testing"
-    :validate [#(#{"redis" "testing"} %) "Backend must be redis or testing"]] 
+    :validate [#(#{"redis" "testing"} %) "Backend must be redis or testing"]]
    ["-d" "--delete-pattern PATTERN" "Specifies how the operations will be reordered on delete"
     :default "forward"
     :validate [#(#{"forward" "reverse" "shuffle" "zero"} %) "Incorrect delete pattern"]

project.clj

@@ -1,14 +1,19 @@
-(defproject tree "0.1.0-SNAPSHOT"
+(defproject hitchhiker-tree "0.1.0-SNAPSHOT"
   :description "A Hitchhiker Tree Library"
   :url "https://github.com/dgrnbrg/hitchhiker-tree"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :aliases {"bench" ["run" "-m" "hitchhiker.bench"]}
   :dependencies [[org.clojure/clojure "1.7.0"]
                  [org.clojure/core.memoize "0.5.8"]
-                 [org.clojure/test.check "0.9.0"]
-                 [org.clojure/tools.cli "0.3.3"]
-                 [com.infolace/excel-templates "0.3.3"]
-                 [criterium "0.4.4"]
                  [com.taoensso/carmine "2.12.2"]
-                 [org.clojure/core.rrb-vector "0.0.11"]])
+                 [org.clojure/core.rrb-vector "0.0.11"]]
+  :aliases {"bench" ["with-profile" "profiling" "run" "-m" "hitchhiker.bench"]}
+  :profiles {:test
+             {:dependencies [[org.clojure/test.check "0.9.0"]]}
+             :profiling
+             {:main hitchhiker.bench
+              :source-paths ["env/profiling"]
+              :dependencies [[criterium "0.4.4"]
+                             [org.clojure/tools.cli "0.3.3"]
+                             [org.clojure/test.check "0.9.0"]
+                             [com.infolace/excel-templates "0.3.3"]]}})

src/hitchhiker/outboard.clj

@@ -140,7 +140,7 @@
       (loop [tree (msg/insert tree k v)
              [k v & kvs] kvs]
         (if (and k v)
-          (msg/insert tree k v)
+          (recur (msg/insert tree k v) kvs)
           tree))
       (msg/insert tree k v))))