riak 0.7.0.1 → 0.7.0.2
raw patch · 23 files changed
+36/−31 lines, 23 filesnew-uploader
Files
- README.markdown +5/−3
- riak.cabal +4/−4
- src/Network/Riak.hs +1/−1
- src/Network/Riak/Basic.hs +1/−1
- src/Network/Riak/Connection.hs +1/−1
- src/Network/Riak/Connection/Internal.hs +6/−3
- src/Network/Riak/Connection/NoPush.hsc +2/−2
- src/Network/Riak/Connection/Pool.hs +1/−1
- src/Network/Riak/Content.hs +1/−1
- src/Network/Riak/Debug.hs +1/−1
- 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 +1/−1
- src/Network/Riak/Value.hs +1/−1
- src/Network/Riak/Value/Resolvable.hs +1/−1
README.markdown view
@@ -12,9 +12,9 @@ and other improvements. Please report bugs via the-[github issue tracker](http://github.com/bos/riak-haskell-client/issues).+[github issue tracker](http://github.com/janrain/riak-haskell-client/issues). -Master [git repository](http://github.com/bos/riak-haskell-client):+Master [git repository](http://github.com/janrain/riak-haskell-client): * `git clone git://github.com/bos/riak-haskell-client.git` @@ -27,5 +27,7 @@ Authors ------- -This library is written and maintained by Bryan O'Sullivan,+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.1+version: 0.7.0.2 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/bos/riak-haskell-client+homepage: http://github.com/janrain/riak-haskell-client license: OtherLicense license-file: LICENSE author: Bryan O'Sullivan <bos@serpentine.com>-maintainer: Bryan O'Sullivan <bos@serpentine.com>+maintainer: Nathan Hunter <nhunter@janrain.com> copyright: Copyright 2011 MailRank, Inc. Portions copyright 2007-2010 Basho Technologies, Inc. category: Network@@ -107,4 +107,4 @@ source-repository head type: git- location: http://github.com/bos/riak-haskell-client+ location: http://github.com/janrain/riak-haskell-client
src/Network/Riak.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Connection.hs view
@@ -2,7 +2,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --@@ -53,9 +53,11 @@ import Network.Riak.Types.Internal hiding (MessageTag(..)) import Network.Socket as Socket import Numeric (showHex)+import System.Mem.Weak (addFinalizer) import System.Random (randomIO) import Text.ProtocolBuffers (messageGetM, messagePutM, messageSize) import Text.ProtocolBuffers.Get (Get, Result(..), getWord32be, runGet)+import qualified Control.Exception as E import qualified Data.ByteString as B import qualified Data.ByteString.Lazy.Char8 as L import qualified Network.Riak.Types.Internal as T@@ -112,6 +114,7 @@ Socket.connect sock (addrAddress ai) buf <- newIORef L.empty let conn = Connection sock client buf+ addFinalizer conn $ sClose sock -- Data.Pool doesn't guarantee our disconnect gets called... setClientID conn clientID return conn @@ -178,7 +181,7 @@ case mbs of Just bs -> step $ runGet get bs Nothing -> moduleError "recvGet" "socket closed"- + recvGetN :: Connection -> Int64 -> Get a -> IO a recvGetN conn n get = do bs <- recvExactly conn n@@ -340,7 +343,7 @@ onIOException :: String -> IO a -> IO a onIOException func act =- act `catch` \(e::IOException) -> do+ act `E.catch` \(e::IOException) -> do let s = show e debug func $ "caught IO exception: " ++ s moduleError func s
src/Network/Riak/Connection/NoPush.hsc view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection.NoPush -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --@@ -17,7 +17,7 @@ #include <netinet/in.h> import Foreign.C.Error (throwErrnoIfMinus1_)-import Foreign.C.Types (CInt)+import Foreign.C.Types (CInt(..)) import Foreign.Marshal.Utils (with) import Foreign.Ptr (Ptr) import Foreign.Storable (sizeOf)
src/Network/Riak/Connection/Pool.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Pool -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Content.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Escape.hs view
@@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Types/Internal.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Types.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --
src/Network/Riak/Value.hs view
@@ -5,7 +5,7 @@ -- Module: Network.Riak.Value -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache--- Maintainer: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: 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: Bryan O'Sullivan <bos@serpentine.com>+-- Maintainer: Nathan Hunter <nhunter@janrain.com> -- Stability: experimental -- Portability: portable --