riak 0.7.0.2 → 0.7.0.3
raw patch · 23 files changed
+47/−52 lines, 23 filesnew-uploader
Files
- README.markdown +10/−14
- riak.cabal +8/−8
- src/Network/Riak.hs +1/−1
- src/Network/Riak/Basic.hs +1/−2
- src/Network/Riak/Connection.hs +1/−1
- src/Network/Riak/Connection/Internal.hs +1/−1
- src/Network/Riak/Connection/NoPush.hsc +1/−1
- src/Network/Riak/Connection/Pool.hs +3/−3
- src/Network/Riak/Content.hs +1/−1
- src/Network/Riak/Debug.hs +2/−2
- src/Network/Riak/Escape.hs +1/−1
- src/Network/Riak/Functions.hs +1/−1
- src/Network/Riak/JSON.hs +1/−1
- src/Network/Riak/JSON/Resolvable.hs +1/−1
- src/Network/Riak/Request.hs +1/−1
- src/Network/Riak/Resolvable.hs +1/−1
- src/Network/Riak/Resolvable/Internal.hs +1/−1
- src/Network/Riak/Response.hs +1/−1
- src/Network/Riak/Tag.hs +1/−1
- src/Network/Riak/Types.hs +1/−1
- src/Network/Riak/Types/Internal.hs +4/−4
- src/Network/Riak/Value.hs +1/−1
- src/Network/Riak/Value/Resolvable.hs +3/−3
README.markdown view
@@ -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 (<bos@serpentine.com>), and then [Janrain, Inc.](http://janrain.com/), it is now being maintained by Mark Hibberd (<mark@hibberd.id.au>).+ # 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 <https://github.com/markhibberd/riak-haskell-client>. -* `hg clone http://bitbucket.org/bos/riak-haskell-client` -(You can create and contribute changes using either git or Mercurial.)+# Build -Authors--------+[](https://travis-ci.org/markhibberd/riak-haskell-client) -This library was written by Bryan O'Sullivan,-<bos@serpentine.com>.-It is maintained by Nathan Hunter,-<nhunter@janrain.com>
riak.cabal view
@@ -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 <bos@serpentine.com>-maintainer: Nathan Hunter <nhunter@janrain.com>+maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> 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
src/Network/Riak.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Basic.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Basic -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --@@ -147,4 +147,3 @@ if fromMaybe False . MapReduce.done $ mr then return z' else loop z' =<< recvResponse conn-
src/Network/Riak/Connection.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Connection/Internal.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Connection/NoPush.hsc view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection.NoPush -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Connection/Pool.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Pool -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- 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.
src/Network/Riak/Content.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Debug.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Debug -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- 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 ++ "]"
src/Network/Riak/Escape.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Functions.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.Functions -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/JSON.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.JSON -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/JSON/Resolvable.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.JSON.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Request.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Request -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Resolvable.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Resolvable/Internal.hs view
@@ -3,7 +3,7 @@ -- Module: Network.Riak.Resolvable.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Response.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Request -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Tag.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Types.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.Types -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Types/Internal.hs view
@@ -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 <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- 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)
src/Network/Riak/Value.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Value -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Value/Resolvable.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.Value.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Nathan Hunter <nhunter@janrain.com>+-- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com> -- 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