riak 0.6.0.1 → 0.7.0.1
raw patch · 23 files changed
+50/−38 lines, 23 filesdep ~riak-protobuf
Dependency ranges changed: riak-protobuf
Files
- README.markdown +4/−4
- riak.cabal +6/−6
- 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 +1/−1
- src/Network/Riak/Connection/NoPush.hsc +1/−1
- src/Network/Riak/Connection/Pool.hs +1/−1
- src/Network/Riak/Content.hs +2/−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 +14/−5
- src/Network/Riak/Resolvable.hs +1/−1
- src/Network/Riak/Resolvable/Internal.hs +1/−1
- src/Network/Riak/Response.hs +5/−3
- 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 +2/−2
- src/Network/Riak/Value/Resolvable.hs +1/−1
README.markdown view
@@ -12,11 +12,11 @@ and other improvements. Please report bugs via the-[github issue tracker](http://github.com/mailrank/riak-haskell-client/issues).+[github issue tracker](http://github.com/bos/riak-haskell-client/issues). -Master [git repository](http://github.com/mailrank/riak-haskell-client):+Master [git repository](http://github.com/bos/riak-haskell-client): -* `git clone git://github.com/mailrank/riak-haskell-client.git`+* `git clone git://github.com/bos/riak-haskell-client.git` There's also a [Mercurial mirror](http://bitbucket.org/bos/riak-haskell-client): @@ -28,4 +28,4 @@ ------- This library is written and maintained by Bryan O'Sullivan,-<bos@mailrank.com>.+<bos@serpentine.com>.
riak.cabal view
@@ -1,5 +1,5 @@ name: riak-version: 0.6.0.1+version: 0.7.0.1 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/mailrank/riak-haskell-client+homepage: http://github.com/bos/riak-haskell-client license: OtherLicense license-file: LICENSE-author: Bryan O'Sullivan <bos@mailrank.com>-maintainer: Bryan O'Sullivan <bos@mailrank.com>+author: Bryan O'Sullivan <bos@serpentine.com>+maintainer: Bryan O'Sullivan <bos@serpentine.com> copyright: Copyright 2011 MailRank, Inc. Portions copyright 2007-2010 Basho Technologies, Inc. category: Network@@ -91,7 +91,7 @@ protocol-buffers >= 2.0.5, pureMD5, random,- riak-protobuf >= 0.15.0.0,+ riak-protobuf >= 0.16.0.1, text >= 0.11.0.6, time @@ -107,4 +107,4 @@ source-repository head type: git- location: http://github.com/mailrank/riak-haskell-client+ location: http://github.com/bos/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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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: Bryan O'Sullivan <bos@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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: Bryan O'Sullivan <bos@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com> -- Stability: experimental -- Portability: portable --@@ -46,6 +46,7 @@ , last_mod = Nothing , last_mod_usecs = Nothing , usermeta = Seq.empty+ , indexes = Seq.empty } -- | Content encoded as @application/octet-stream@.
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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com> -- Stability: experimental -- Portability: portable --@@ -81,7 +81,14 @@ get :: Bucket -> Key -> R -> Get.GetRequest get bucket key r = Get.GetRequest { Get.bucket = escape bucket , Get.key = escape key- , Get.r = fromQuorum r }+ , Get.r = fromQuorum r+ , Get.pr = Nothing+ , Get.basic_quorum = Nothing+ , Get.notfound_ok = Nothing+ , Get.if_modified = Nothing+ , Get.head = Nothing+ , Get.deletedvclock = Nothing+ } {-# INLINE get #-} -- | Create a put request. The bucket and key names are URL-escaped.@@ -90,8 +97,9 @@ put :: Bucket -> Key -> Maybe VClock -> Content -> W -> DW -> Bool -> Put.PutRequest put bucket key mvclock cont mw mdw returnBody =- Put.PutRequest (escape bucket) (escape key) (fromVClock <$> mvclock) cont- (fromQuorum mw) (fromQuorum mdw) (Just returnBody)+ Put.PutRequest (escape bucket) (Just $ escape key) (fromVClock <$> mvclock)+ cont (fromQuorum mw) (fromQuorum mdw) (Just returnBody)+ Nothing Nothing Nothing Nothing {-# INLINE put #-} -- | Create a link. The bucket and key names are URL-escaped.@@ -102,7 +110,8 @@ -- | Create a delete request. The bucket and key names are URL-escaped. delete :: Bucket -> Key -> RW -> Del.DeleteRequest delete bucket key rw = Del.DeleteRequest (escape bucket) (escape key)- (fromQuorum rw)+ (fromQuorum rw) Nothing Nothing Nothing+ Nothing Nothing Nothing {-# INLINE delete #-} -- | Create a list-buckets request.
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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com> -- Stability: experimental -- Portability: portable --@@ -38,6 +38,7 @@ import Network.Riak.Protocol.ListBucketsResponse import Network.Riak.Protocol.PutResponse import Network.Riak.Types.Internal hiding (MessageTag(..))+import qualified Network.Riak.Protocol.Link as Link import qualified Data.ByteString.Lazy as L import qualified Data.Sequence as Seq @@ -48,7 +49,7 @@ -- | Construct a get response. Bucket and key names in links are -- URL-unescaped. get :: Maybe GetResponse -> Maybe (Seq.Seq Content, VClock)-get (Just (GetResponse content (Just vclock)))+get (Just (GetResponse content (Just vclock) _)) = Just (unescapeLinks <$> content, VClock vclock) get _ = Nothing {-# INLINE get #-}@@ -73,4 +74,5 @@ -- 'Content' value. unescapeLinks :: Content -> Content unescapeLinks c = c { links = go <$> links c }- where go l = l { bucket = unescape <$> bucket l, key = unescape <$> key l }+ where go l = l { bucket = unescape <$> bucket l+ , Link.key = unescape <$> Link.key l }
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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com> -- Stability: experimental -- Portability: portable --@@ -153,7 +153,7 @@ getResp :: (IsContent c) => Maybe GetResponse -> IO (Maybe ([c], VClock)) getResp resp = case resp of- Just (GetResponse content (Just s)) -> do+ Just (GetResponse content (Just s) _) -> do c <- convert content return $ Just (c, VClock s) _ -> return Nothing
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@mailrank.com>+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com> -- Stability: experimental -- Portability: portable --