diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -1,33 +1,29 @@ -# Welcome to riak-haskell-client +# Welcome to the Haskell Riak client This library is a fast Haskell client for the -[Riak](http://www.basho.com/Riak.html) decentralized data store. +[Riak](http://www.basho.com/Riak.html) decentralized key/value data store. It uses Riak's [protobuf API](http://wiki.basho.com/PBC-API.html) for optimal performance. +This project was originally the work of Bryan O'Sullivan (), and then [Janrain, Inc.](http://janrain.com/), it is now being maintained by Mark Hibberd (). + # Join in! We are happy to receive bug reports, fixes, documentation enhancements, and other improvements. Please report bugs via the -[github issue tracker](http://github.com/janrain/riak-haskell-client/issues). +[github issue tracker](http://github.com/markhibberd/riak-haskell- client/issues). -Master [git repository](http://github.com/janrain/riak-haskell-client): +Master [git repository](http://github.com/markhibberd/riak-haskell-client): -* `git clone git://github.com/bos/riak-haskell-client.git` +* `git clone git://github.com/markhibberd/riak-haskell-client.git` -There's also a [Mercurial mirror](http://bitbucket.org/bos/riak-haskell-client): +Note the official repo is now . -* `hg clone http://bitbucket.org/bos/riak-haskell-client` -(You can create and contribute changes using either git or Mercurial.) +# Build -Authors -------- +[![Build Status](https://travis-ci.org/markhibberd/riak-haskell-client.svg)](https://travis-ci.org/markhibberd/riak-haskell-client) -This library was written by Bryan O'Sullivan, -. -It is maintained by Nathan Hunter, - diff --git a/riak.cabal b/riak.cabal --- a/riak.cabal +++ b/riak.cabal @@ -1,5 +1,5 @@ name: riak -version: 0.7.0.2 +version: 0.7.0.3 synopsis: A Haskell client for the Riak decentralized data store description: A Haskell client library for the Riak decentralized data @@ -28,11 +28,11 @@ and decode data yourself, and handle all conflict resolution yourself. -homepage: http://github.com/janrain/riak-haskell-client +homepage: http://github.com/markhibberd/riak-haskell-client license: OtherLicense license-file: LICENSE author: Bryan O'Sullivan -maintainer: Nathan Hunter +maintainer: Mark Hibberd , Nathan Hunter copyright: Copyright 2011 MailRank, Inc. Portions copyright 2007-2010 Basho Technologies, Inc. category: Network @@ -53,7 +53,7 @@ library hs-source-dirs: src - exposed-modules: + exposed-modules: Network.Riak Network.Riak.Basic Network.Riak.Connection @@ -71,14 +71,14 @@ Network.Riak.Value Network.Riak.Value.Resolvable - other-modules: + other-modules: Network.Riak.Connection.Internal Network.Riak.Connection.NoPush Network.Riak.Resolvable.Internal Network.Riak.Tag Network.Riak.Types.Internal - - build-depends: + + build-depends: aeson >= 0.3.2.4, attoparsec >= 0.8.5.3, base == 4.*, @@ -107,4 +107,4 @@ source-repository head type: git - location: http://github.com/janrain/riak-haskell-client + location: http://github.com/markhibberd/riak-haskell-client diff --git a/src/Network/Riak.hs b/src/Network/Riak.hs --- a/src/Network/Riak.hs +++ b/src/Network/Riak.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Basic.hs b/src/Network/Riak/Basic.hs --- a/src/Network/Riak/Basic.hs +++ b/src/Network/Riak/Basic.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Basic -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -147,4 +147,3 @@ if fromMaybe False . MapReduce.done $ mr then return z' else loop z' =<< recvResponse conn - diff --git a/src/Network/Riak/Connection.hs b/src/Network/Riak/Connection.hs --- a/src/Network/Riak/Connection.hs +++ b/src/Network/Riak/Connection.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Connection/Internal.hs b/src/Network/Riak/Connection/Internal.hs --- a/src/Network/Riak/Connection/Internal.hs +++ b/src/Network/Riak/Connection/Internal.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Connection/NoPush.hsc b/src/Network/Riak/Connection/NoPush.hsc --- a/src/Network/Riak/Connection/NoPush.hsc +++ b/src/Network/Riak/Connection/NoPush.hsc @@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection.NoPush -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Connection/Pool.hs b/src/Network/Riak/Connection/Pool.hs --- a/src/Network/Riak/Connection/Pool.hs +++ b/src/Network/Riak/Connection/Pool.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Pool -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -69,7 +69,7 @@ -> Int -- ^ Maximum number of connections to keep open per stripe. -- The smallest acceptable value is 1. - -- + -- -- Requests for connections will block if this limit is reached -- on a single stripe, even if other stripes have idle -- connections available. @@ -95,7 +95,7 @@ -- | Maximum number of connections to keep open per stripe. The -- smallest acceptable value is 1. --- +-- -- Requests for connections will block if this limit is reached on a -- single stripe, even if other stripes have idle connections -- available. diff --git a/src/Network/Riak/Content.hs b/src/Network/Riak/Content.hs --- a/src/Network/Riak/Content.hs +++ b/src/Network/Riak/Content.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Debug.hs b/src/Network/Riak/Debug.hs --- a/src/Network/Riak/Debug.hs +++ b/src/Network/Riak/Debug.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Debug -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -86,7 +86,7 @@ debugValues func str values #ifdef DEBUG | level == 0 = return () - | otherwise = + | otherwise = withMVar handle $ \h -> do hPutStrLn h $ str ++ ": " ++ show (length values) ++ " values [" ++ func ++ "]" diff --git a/src/Network/Riak/Escape.hs b/src/Network/Riak/Escape.hs --- a/src/Network/Riak/Escape.hs +++ b/src/Network/Riak/Escape.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Functions.hs b/src/Network/Riak/Functions.hs --- a/src/Network/Riak/Functions.hs +++ b/src/Network/Riak/Functions.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Functions -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/JSON.hs b/src/Network/Riak/JSON.hs --- a/src/Network/Riak/JSON.hs +++ b/src/Network/Riak/JSON.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.JSON -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/JSON/Resolvable.hs b/src/Network/Riak/JSON/Resolvable.hs --- a/src/Network/Riak/JSON/Resolvable.hs +++ b/src/Network/Riak/JSON/Resolvable.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.JSON.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Request.hs b/src/Network/Riak/Request.hs --- a/src/Network/Riak/Request.hs +++ b/src/Network/Riak/Request.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Request -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Resolvable.hs b/src/Network/Riak/Resolvable.hs --- a/src/Network/Riak/Resolvable.hs +++ b/src/Network/Riak/Resolvable.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Resolvable/Internal.hs b/src/Network/Riak/Resolvable/Internal.hs --- a/src/Network/Riak/Resolvable/Internal.hs +++ b/src/Network/Riak/Resolvable/Internal.hs @@ -3,7 +3,7 @@ -- Module: Network.Riak.Resolvable.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Response.hs b/src/Network/Riak/Response.hs --- a/src/Network/Riak/Response.hs +++ b/src/Network/Riak/Response.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Request -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Tag.hs b/src/Network/Riak/Tag.hs --- a/src/Network/Riak/Tag.hs +++ b/src/Network/Riak/Tag.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Types.hs b/src/Network/Riak/Types.hs --- a/src/Network/Riak/Types.hs +++ b/src/Network/Riak/Types.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Types -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Types/Internal.hs b/src/Network/Riak/Types/Internal.hs --- a/src/Network/Riak/Types/Internal.hs +++ b/src/Network/Riak/Types/Internal.hs @@ -1,11 +1,11 @@ -{-# LANGUAGE DeriveDataTypeable, FunctionalDependencies, MultiParamTypeClasses, +{-# LANGUAGE DeriveDataTypeable, FunctionalDependencies, MultiParamTypeClasses, RecordWildCards #-} -- | -- Module: Network.Riak.Types.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -53,7 +53,7 @@ import Data.Word (Word32) import Network.Socket (HostName, ServiceName, Socket) import Text.ProtocolBuffers (ReflectDescriptor, Wire) - + -- | A client identifier. This is used by the Riak cluster when -- logging vector clock changes, and should be unique for each client. type ClientID = ByteString @@ -106,7 +106,7 @@ instance Show RiakException where show = showRiakException -instance Exception RiakException +instance Exception RiakException netError :: String -> String -> String -> a netError modu func msg = throw (NetException modu func msg) diff --git a/src/Network/Riak/Value.hs b/src/Network/Riak/Value.hs --- a/src/Network/Riak/Value.hs +++ b/src/Network/Riak/Value.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Value -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Value/Resolvable.hs b/src/Network/Riak/Value/Resolvable.hs --- a/src/Network/Riak/Value/Resolvable.hs +++ b/src/Network/Riak/Value/Resolvable.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Value.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Nathan Hunter +-- Maintainer: Mark Hibberd , Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -106,7 +106,7 @@ put :: (Resolvable a, V.IsContent a) => Connection -> Bucket -> Key -> Maybe VClock -> a -> W -> DW -> IO (a, VClock) -put = R.put V.put +put = R.put V.put {-# INLINE put #-} -- | Store a single value, automatically resolving any vector clock @@ -124,7 +124,7 @@ put_ :: (Resolvable a, V.IsContent a) => Connection -> Bucket -> Key -> Maybe VClock -> a -> W -> DW -> IO () -put_ = R.put_ V.put +put_ = R.put_ V.put {-# INLINE put_ #-} -- | Store multiple values, resolving any vector clock conflicts that