Permalink
Browse files

update to flatland.useful and flatland.retro

  • Loading branch information...
1 parent 6e1313b commit 1317a6830d883ccd5fe9ff1b4cd51f65c0a2f022 @ninjudd ninjudd committed Nov 14, 2012
View
@@ -1,11 +1,11 @@
-(defproject org.flatland/masai "0.8.0-beta1"
+(defproject org.flatland/masai "0.8.0-SNAPSHOT"
:url "https://github.com/flatland/masai"
:license {:name "Eclipse Public License - v 1.0"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:description "Key-value database for Clojure with pluggable backends."
:dependencies [[org.clojure/clojure "1.4.0"]
- [useful "0.8.8"]
- [retro "0.7.0"]]
+ [org.flatland/useful "0.8.9-SNAPSHOT"]
+ [org.flatland/retro "0.7.2-SNAPSHOT"]]
:profiles {:1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}
:1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
:dev {:dependencies [[tokyocabinet "1.24.4"]
@@ -1,7 +1,7 @@
(ns flatland.masai.db
(:require [flatland.masai.cursor :as c]
- [useful.macro :refer [macro-do]]
- [useful.io :refer [compare-bytes]]))
+ [flatland.useful.macro :refer [macro-do]]
+ [flatland.useful.io :refer [compare-bytes]]))
;; Instead of having separate, incompatible libraries to interface with
;; different key-value stores, Masai opts to define a common and simple
@@ -1,5 +1,5 @@
(ns flatland.masai.memcached
- (:use [useful.map :only [into-map]])
+ (:use [flatland.useful.map :only [into-map]])
(:require flatland.masai.db)
(:import net.spy.memcached.MemcachedClient
[java.net InetSocketAddress InetAddress]))
@@ -1,5 +1,5 @@
(ns flatland.masai.redis
- (:use [useful.map :only [into-map]]
+ (:use [flatland.useful.map :only [into-map]]
[clojure.stacktrace :only [root-cause]])
(:require flatland.masai.db)
(:import redis.clients.jedis.BinaryJedis))
@@ -1,7 +1,7 @@
(ns flatland.masai.tokyo
- (:use [useful.map :only [into-map]]
- [useful.utils :only [thread-local]])
- (:require flatland.masai.db retro.core
+ (:use [flatland.useful.map :only [into-map]]
+ [flatland.useful.utils :only [thread-local]])
+ (:require flatland.masai.db flatland.retro.core
[flatland.masai.tokyo-common :as tokyo])
(:import [tokyocabinet HDB]))
@@ -110,7 +110,7 @@
(check (.vanish hdb))))
(extend DB
- retro.core/Transactional
+ flatland.retro.core/Transactional
(tokyo/transaction-impl DB hdb HDB))
(defn make
@@ -1,7 +1,7 @@
(ns flatland.masai.tokyo-common
- (:use [useful.utils :only [thread-local]])
+ (:use [flatland.useful.utils :only [thread-local]])
(:require [flatland.masai.db :as db]
- [retro.core :as retro]))
+ [flatland.retro.core :as retro]))
;; I hate this so much. But we need per-thread mutable state, without the safety of binding
(def transaction-depths (thread-local (atom {})))
@@ -1,8 +1,8 @@
(ns flatland.masai.tokyo-sorted
- (:use [useful.map :only [into-map]]
- [useful.seq :only [lazy-loop]]
- [useful.experimental :only [order-let-if]])
- (:require flatland.masai.db retro.core flatland.masai.cursor
+ (:use [flatland.useful.map :only [into-map]]
+ [flatland.useful.seq :only [lazy-loop]]
+ [flatland.useful.experimental :only [order-let-if]])
+ (:require flatland.masai.db flatland.retro.core flatland.masai.cursor
[flatland.masai.tokyo-common :as tokyo])
(:import [tokyocabinet BDB BDBCUR]))
@@ -105,7 +105,7 @@
(flatland.masai.cursor/jump key))))
(extend DB
- retro.core/Transactional
+ flatland.retro.core/Transactional
(tokyo/transaction-impl DB bdb BDB))
(extend-type BDBCUR
@@ -1,13 +1,13 @@
(ns flatland.masai.db-test
(:refer-clojure :exclude [get count sync])
- (:use clojure.test useful.debug)
+ (:use clojure.test flatland.useful.debug)
(:require [flatland.masai.tokyo :as tokyo]
[flatland.masai.tokyo-sorted :as tokyo-btree]
[flatland.masai.memcached :as memcached]
[flatland.masai.redis :as redis]
[flatland.masai.db :as db]
[flatland.masai.cursor :as cursor]
- [retro.core :as retro]))
+ [flatland.retro.core :as retro]))
(def b (memfn getBytes))

0 comments on commit 1317a68

Please sign in to comment.