Merge pull request #16 from ernestas/whitespace

Whitespace clean up

Author: dgrnbrg

env/profiling/hitchhiker/bench.clj

@@ -1,8 +1,8 @@
 (ns hitchhiker.bench
   (:require [clojure.pprint :as pp]
             [clojure.string :as str]
+            [clojure.tools.cli :refer [parse-opts]]
             [excel-templates.build :as excel]
-            [clojure.tools.cli :refer (parse-opts)]
             [hitchhiker.redis :as redis]
             [hitchhiker.tree.core :as core]
             [hitchhiker.tree.messaging :as msg])

src/hitchhiker/outboard.clj

@@ -1,8 +1,8 @@
 (ns hitchhiker.outboard
   (:require [hitchhiker.redis :as redis]
             [hitchhiker.tree.core :as core]
-            [taoensso.carmine :as car :refer (wcar)]
-            [hitchhiker.tree.messaging :as msg])
+            [hitchhiker.tree.messaging :as msg]
+            [taoensso.carmine :as car :refer [wcar]])
   (:import [java.util.concurrent LinkedBlockingQueue TimeUnit]))
 
 ;;; API

src/hitchhiker/redis.clj

@@ -1,15 +1,13 @@
 (ns hitchhiker.redis
-  (:require [clojure.pprint :as pp]
-            [taoensso.carmine :as car :refer (wcar)]
-            [taoensso.nippy :as nippy]
-            [hitchhiker.tree.core :as core]
+  (:require [clojure.core.cache :as cache]
             [clojure.string :as str]
-            [clojure.core.memoize :as memo]
-            [clojure.core.cache :as cache]
-            [hitchhiker.tree.messaging :as msg]))
+            [hitchhiker.tree.core :as core]
+            [hitchhiker.tree.messaging :as msg]
+            [taoensso.carmine :as car :refer [wcar]]
+            [taoensso.nippy :as nippy]))
 
 ;;; Description of refcounting system in redis
-;;; 
+;;;
 ;;; The refcounting system allows any key in redis to be managed
 ;;; by refcounting. This refcounter doesn't do cycle protection, but
 ;;; weakrefs would be very simple to add.
@@ -276,19 +274,19 @@
           e ["" ":rc" ":rs" ":rl"]]
     (println (str k e) "=" (wcar {} ((if (= e ":rl")
                                        #(car/lrange % 0 -1)
-                                       car/get) (str k e))))) 
+                                       car/get) (str k e)))))
   (wcar {} (drop-ref "foo"))
 
   (wcar {} (create-refcounted "foo" 22))
 
   (wcar {} (car/flushall))
-  (count (wcar {} (car/keys "*")))    
+  (count (wcar {} (car/keys "*")))
   (count (msg/lookup-fwd-iter (create-tree-from-root-key @(:storage-addr (:tree my-tree))) -1))
   (count (msg/lookup-fwd-iter (create-tree-from-root-key @(:storage-addr (:tree my-tree-updated))) -1))
   (def my-tree (core/flush-tree
                  (time (reduce msg/insert
                                (core/b-tree (core/->Config 17 300 (- 300 17)))
-                               (range 50000))) 
+                               (range 50000)))
                  (->RedisBackend)
                  ))
   (def my-tree-updated (core/flush-tree

src/hitchhiker/tree/core.clj

@@ -1,11 +1,10 @@
 (ns hitchhiker.tree.core
   (:refer-clojure :exclude [compare resolve subvec])
-  (:require [clojure.core.rrb-vector :refer (catvec subvec)]
-            [taoensso.nippy :as nippy]
-            [clojure.pprint :as pp])
+  (:require [clojure.core.rrb-vector :refer [catvec subvec]]
+            [clojure.pprint :as pp]
+            [taoensso.nippy :as nippy])
   (:import java.io.Writer
-           java.util.Arrays
-           java.util.Collections))
+           [java.util Arrays Collections]))
 
 (defrecord Config [index-b data-b op-buf-size])
 
@@ -29,7 +28,7 @@
   (underflow? [node] "Returns true if this node has too few elements")
   (merge-node [node other] "Combines this node with the other to form a bigger node. We assume they're siblings")
   (split-node [node] "Returns a Split object with the 2 nodes that we turned this into")
-  (lookup [node key] "Returns the child node which contains the given key")) 
+  (lookup [node key] "Returns the child node which contains the given key"))
 
 (defrecord Split [left right median])
 
@@ -357,7 +356,7 @@
               child (if (data-node? cur)
                       nil #_(nth-of-set (:children cur) index)
                       (-> (:children cur)
-                          ;;TODO what are the semantics for exceeding on the right? currently it's trunc to the last element 
+                          ;;TODO what are the semantics for exceeding on the right? currently it's trunc to the last element
                           (nth index (peek (:children cur)))
                           (resolve)))
               path' (conj path index child)]

src/hitchhiker/tree/messaging.clj

@@ -1,10 +1,9 @@
 (ns hitchhiker.tree.messaging
   (:refer-clojure :exclude [subvec])
-  (:require [hitchhiker.tree.core :as core]
-            [clojure.pprint :as pp] 
-            [clojure.core.rrb-vector :refer (catvec subvec)])
-  (:import java.io.Writer
-           java.util.Collections)) 
+  (:require [clojure.core.rrb-vector :refer [catvec]]
+            [clojure.pprint :as pp]
+            [hitchhiker.tree.core :as core])
+  (:import java.io.Writer))
 
 ;; An operation is an object with a few functions
 ;; 1. It has a function that it applies to the tree to apply its effect
@@ -89,7 +88,7 @@
            ;         )
            (loop [[child & children] (:children tree)
                   rebuilt-children []
-                  msgs (vec (sort-by affects-key ;must be a stable sort 
+                  msgs (vec (sort-by affects-key ;must be a stable sort
                                      (concat (:op-buf tree) msgs)))]
              (let [took-msgs (into []
                                    (take-while #(>= 0 (core/compare
@@ -177,7 +176,7 @@
                             (drop-while #(>= 0 (core/compare (affects-key %)
                                                              left-sibs-min-last)))
                             identity)
-          data-node (peek path) 
+          data-node (peek path)
           my-last (core/last-key data-node)
           right-side-filter (if is-last?
                               identity

test/hitchhiker/redis_test.clj

@@ -1,14 +1,12 @@
 (ns hitchhiker.redis-test
-  (:require [clojure.test :refer :all]
-            [taoensso.carmine :as car :refer (wcar)]
+  (:require [clojure.test.check.clojure-test :refer [defspec]]
+            [clojure.test.check.generators :as gen]
+            [clojure.test.check.properties :as prop]
+            [hitchhiker.redis :as redis]
             [hitchhiker.tree.core :as core]
+            hitchhiker.tree.core-test
             [hitchhiker.tree.messaging :as msg]
-            [hitchhiker.tree.core-test]
-            [hitchhiker.redis :as redis]
-            [clojure.test.check :as tc]
-            [clojure.test.check.clojure-test :refer (defspec)]
-            [clojure.test.check.generators :as gen]
-            [clojure.test.check.properties :as prop]))
+            [taoensso.carmine :as car :refer [wcar]]))
 
 (defn insert
   [t k]
@@ -99,7 +97,7 @@
       (println (->> (read-string (slurp "broken-data.edn"))
                     (map (fn [[op x]] [op (mod x 100000)]))
                     (take-last  125)
-                    first)) 
+                    first))
       (println (lookup-fwd-iter b-tree -1))
       (println (sort s))
       ))

test/hitchhiker/tree/core_test.clj

@@ -1,12 +1,11 @@
 (ns hitchhiker.tree.core-test
-  (:refer-clojure :exclude [compare resolve]) 
+  (:refer-clojure :exclude [compare resolve])
   (:require [clojure.test :refer :all]
-            [hitchhiker.tree.core :refer :all]
             [clojure.test.check :as tc]
-            [clojure.test.check.clojure-test :refer (defspec)]
+            [clojure.test.check.clojure-test :refer [defspec]]
             [clojure.test.check.generators :as gen]
-            [clojure.test.check.properties :as prop]))
-
+            [clojure.test.check.properties :as prop]
+            [hitchhiker.tree.core :refer :all]))
 
 (deftest simple-read-only-behavior
   (testing "Basic searches"
@@ -47,7 +46,7 @@
                 (let [sorted-set-order (into (sorted-set) v)
                       b-tree (reduce insert-helper (b-tree (->Config 3 3 2)) v)
                       b-tree-order (lookup-fwd-iter b-tree Integer/MIN_VALUE)]
-                  (= (seq sorted-set-order) (seq (map first b-tree-order)))))) 
+                  (= (seq sorted-set-order) (seq (map first b-tree-order))))))
 
 (defspec test-delete2
   1000

test/hitchhiker/tree/messaging_test.clj

@@ -1,12 +1,10 @@
 (ns hitchhiker.tree.messaging-test
-  (:require [clojure.test :refer :all]
-            [hitchhiker.tree.core :as core]
-            [hitchhiker.tree.messaging :as msg]
-            [hitchhiker.tree.core-test]
-            [clojure.test.check :as tc]
-            [clojure.test.check.clojure-test :refer (defspec)]
+  (:require [clojure.test.check.clojure-test :refer [defspec]]
             [clojure.test.check.generators :as gen]
-            [clojure.test.check.properties :as prop]))
+            [clojure.test.check.properties :as prop]
+            [hitchhiker.tree.core :as core]
+            hitchhiker.tree.core-test
+            [hitchhiker.tree.messaging :as msg]))
 
 (defn insert
   [t k]
@@ -30,7 +28,7 @@
                 (let [sorted-set-order (into (sorted-set) v)
                       b-tree (reduce insert (core/b-tree (core/->Config 3 3 2)) v)
                       b-tree-order (lookup-fwd-iter b-tree Integer/MIN_VALUE)]
-                  (= (seq sorted-set-order) b-tree-order)))) 
+                  (= (seq sorted-set-order) b-tree-order))))
 
 (defspec test-delete2
   1000
@@ -86,7 +84,7 @@
                :del (msg/delete %2 (second %1)))
           ]
       ;  (println ops)
-      (println killer-op) 
+      (println killer-op)
       (clojure.pprint/pprint b-tree)
       (println (lookup-fwd-iter b-tree -1))
       (println (sort s))
@@ -96,10 +94,10 @@
       (println (lookup-fwd-iter (f killer-op b-tree) -1))
       (println (sort (disj s (second killer-op))))
       (when killer-op-dos
-        (println killer-op-dos) 
+        (println killer-op-dos)
         (clojure.pprint/pprint (f killer-op-dos (f killer-op b-tree)))))
     )
-  
+
   (clojure.pprint/pprint cool-test-tree)
   (clojure.pprint/pprint (insert cool-test-tree 20))
   (clojure.pprint/pprint (msg/delete cool-test-tree 32))