Skip to content

Commit

Permalink
Bump deps and cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
whilo committed Oct 27, 2019
1 parent d3dd334 commit 5775714
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
6 changes: 3 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
(defproject io.replikativ/hitchhiker-tree "0.1.4"
(defproject io.replikativ/hitchhiker-tree "0.1.5-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"}
:dependencies [[org.clojure/clojure "1.10.0"]
[org.clojure/clojurescript "1.10.520" :scope "provided"]
[org.clojure/core.memoize "0.7.1"]
[com.taoensso/carmine "2.12.2"]
[com.taoensso/carmine "2.12.2" :scope "provided"]
[org.clojure/core.rrb-vector "0.0.14"]
[org.clojure/core.cache "0.7.2"]
[io.replikativ/konserve "0.5.0"]]
[io.replikativ/konserve "0.5.1"]]
:aliases {"bench" ["with-profile" "profiling" "run" "-m" "hitchhiker.bench"]}
:jvm-opts ["-server" "-Xmx3700m" "-Xms3700m"]
:profiles {:test
Expand Down
3 changes: 1 addition & 2 deletions src/hitchhiker/tree.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
'stats' object as well
* The 'stats' object must be convertible to a summary or whatever at the end"
(:refer-clojure :exclude [subvec satisfies?])
(:refer-clojure :exclude [subvec])
(:require
[hitchhiker.tree.utils.async :as ha :include-macros true]
[hitchhiker.tree.node :as n]
[hitchhiker.tree.backend :as b]
[hitchhiker.tree.utils.platform :refer [satisfies?]]
[hitchhiker.tree.key-compare :as c]
[clojure.core.rrb-vector :refer [catvec subvec]]
#?(:clj [clojure.core.async :as async]
Expand Down
8 changes: 3 additions & 5 deletions src/hitchhiker/tree/bootstrap/konserve.cljc
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
(ns hitchhiker.tree.bootstrap.konserve
(:refer-clojure :exclude [subvec])
(:require
[clojure.core.rrb-vector :refer [catvec subvec]]
[konserve.cache :as k]
[konserve.memory :refer [new-mem-store]]
[hasch.core :as h]
[clojure.set :as set]
[hitchhiker.tree.messaging :as msg]
[hitchhiker.tree :as tree]
[hitchhiker.tree.node :as n]
[hitchhiker.tree.backend :as b]
[hitchhiker.tree.key-compare :as c]
[hitchhiker.tree.utils.async :as ha]
[hitchhiker.tree.codec.nippy :as nippy]
#?@(:clj [[clojure.core.async :as async]
[clojure.core.cache :as cache]]
:cljs [[cljs.core.async :include-macros true :as async]
Expand Down Expand Up @@ -123,7 +119,9 @@
root-key))))))

(defn add-hitchhiker-tree-handlers [store]
(nippy/ensure-installed!)
;; TODO check whether store is using nippy in the future and load on the fly:
#_[hitchhiker.tree.codec.nippy :as nippy]
#_(nippy/ensure-installed!)
(swap! (:read-handlers store)
merge
{'hitchhiker.tree.bootstrap.konserve.KonserveAddr
Expand Down

0 comments on commit 5775714

Please sign in to comment.