target latest byte-streams, mark 0.1.5

Author: ztellman

README.md

@@ -5,7 +5,7 @@ This library implements a disk-backed task queue, allowing for queues that can s
 ### usage
 
 ```clj
-[factual/durable-queue "0.1.3"]
+[factual/durable-queue "0.1.5"]
 ```
 
 To interact with queues, first create a `queues` object by specifying a directory in the filesystem and an options map:
@@ -49,11 +49,11 @@ To get a description of the current state of the queue, we can use `stats`, whic
 
 ```clj
 > (stats q)
-{:enqueued 2, 
- :retried 0, 
- :completed 1, 
- :in-progress 1, 
- :num-slabs 1, 
+{:enqueued 2,
+ :retried 0,
+ :completed 1,
+ :in-progress 1,
+ :num-slabs 1,
  :num-active-slabs 1}
 ```
 
@@ -68,7 +68,7 @@ To get a description of the current state of the queue, we can use `stats`, whic
 
 ### configuring the queues
 
-`queues` can be given a number of different options, which can affect its performance and correctness.  
+`queues` can be given a number of different options, which can affect its performance and correctness.
 
 By default, it is assumed all tasks are idempotent.  This is necessary, since the process can die at any time and leave an in-progress task in an undefined state.  If your tasks are not idempotent, a `:complete?` predicate can be defined which, on instantiation of the `queues` object, will scan through all pre-existing task descriptors and remove those for which the predicate returns true.
 
@@ -77,7 +77,7 @@ A complete list of options is as follows:
 | name | description |
 |------|-------------|
 | `:complete?` | a predicate for identifying already completed tasks, defaults to always returning false |
-| `:max-queue-size` | the maximum number of elements that can be in the queue before `put!` blocks, defaults to `Integer/MAX_VALUE`	 |
+| `:max-queue-size` | the maximum number of elements that can be in the queue before `put!` blocks, defaults to `Integer/MAX_VALUE`      |
 | `:slab-size` | The size, in bytes, of the backing files for the queue.  The size of a serialized task cannot be larger than this size, defaults to 64mb. |
 | `:fsync-put?` | Whether an fsync should be performed for each `put!`.  Defaults to `true`. |
 | `:fsync-take?` | Whether an fsync should be performed for each `take!`.  Defaults to `false`. |
@@ -90,6 +90,6 @@ Writes can be batched using `fsync-threshold` and/or `fsync-interval`, or by exp
 
 ### license
 
-Copyright © 2013 Factual Inc
+Copyright © 2015 Factual Inc
 
 Distributed under the Eclipse Public License 1.0

project.clj

@@ -1,11 +1,10 @@
-(defproject factual/durable-queue "0.1.3"
+(defproject factual/durable-queue "0.1.5"
   :description "a in-process task-queue that is backed by disk."
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[com.taoensso/nippy "2.5.2"]
-                 [primitive-math "0.1.3"]
-                 [byte-streams "0.1.9"]
-                 [manifold "0.1.0-alpha3"]]
+  :dependencies [[com.taoensso/nippy "2.8.0"]
+                 [primitive-math "0.1.4"]
+                 [byte-streams "0.2.0"]]
   :profiles {:dev {:dependencies [[org.clojure/clojure "1.5.1"]
                                   [criterium "0.4.3"]
                                   [codox-md "0.2.0" :exclusions [org.clojure/clojure]]]}}

src/durable_queue.clj

@@ -4,7 +4,6 @@
     [byte-streams :as bs]
     [clojure.string :as str]
     [primitive-math :as p]
-    [manifold.stream :as s]
     [taoensso.nippy :as nippy])
   (:import
     [java.lang.reflect
@@ -199,7 +198,7 @@
               ary (bs/to-byte-array (.position buf header-size))]
           (when-not (== (checksum (.getInt buf 10) ary) checksum')
             (throw (IOException. "checksum mismatch")))
-          (nippy/thaw-from-bytes ary))))))
+          (nippy/thaw ary))))))
 
 (defmethod print-method Task [t ^Writer w]
   (.write w
@@ -446,7 +445,7 @@
     [_ q-name task-descriptor]
     [_ q-name task-descriptor timeout]
     "A blocking enqueue to `name`.  If `timeout` is specified, returns `false` if unable to
-     enqueue within `timeout` milliseconds."))
+     enqueue within `timeout` milliseconds, `true` otherwise."))
 
 (defn queues
   "Creates a point of interaction for queues, backed by disk storage in `directory`.