Merge branch 'master' into fixes/lrb/timestamp-encoding-gh-454

Author: lukebakken

.gitignore

@@ -14,4 +14,3 @@ riak.egg-info/
 .eggs/
 #*#
 *~
-*.ps1

README.md

@@ -178,6 +178,7 @@ Contributors
 * Mark Phillips
 * Mathias Meyer
 * Matt Heitzenroder
+* [Matt Lohier](https://github.com/aquam8)
 * Mikhail Sobolev
 * Reid Draper
 * Russell Brown

RELNOTES.md

@@ -1,5 +1,11 @@
 # Riak Python Client Release Notes
 
+## [2.5.0 Release](https://github.com/basho/riak-python-client/issues?q=milestone%3Ariak-python-client-2.5.0)
+
+* [Socket Enhancements](https://github.com/basho/riak-python-client/pull/453) - Resolves [#399](https://github.com/basho/riak-python-client/issues/399)
+* [Add multi-put](https://github.com/basho/riak-python-client/pull/452)
+* [Add support for term-to-binary encoding](https://github.com/basho/riak-python-client/pull/448)
+
 ## 2.4.2 Patch Release - 2016-02-20
 
 * [Fix SSL host name](https://github.com/basho/riak-python-client/pull/436)

make.ps1

@@ -0,0 +1,20 @@
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$env:RIAK_TEST_HOST = 'riak-test'
+$env:RIAK_TEST_PROTOCOL = 'pbc'
+$env:RIAK_TEST_PB_PORT = 10017
+$env:RUN_DATATYPES = 1
+$env:RUN_INDEXES = 1
+$env:RUN_POOL = 1
+$env:RUN_YZ = 1
+
+flake8 --exclude=riak/pb riak commands.py setup.py version.py
+if ($LastExitCode -ne 0) {
+    throw 'flake8 failed!'
+}
+
+python setup.py test
+if ($LastExitCode -ne 0) {
+    throw 'python tests failed!'
+}

riak/client/transport.py

@@ -1,6 +1,6 @@
 from contextlib import contextmanager
 from riak.transports.pool import BadResource
-from riak.transports.tcp import is_retryable as is_pbc_retryable
+from riak.transports.tcp import is_retryable as is_tcp_retryable
 from riak.transports.http import is_retryable as is_http_retryable
 import threading
 from six import PY2
@@ -162,7 +162,7 @@ def _is_retryable(error):
     :type error: Exception
     :rtype: boolean
     """
-    return is_pbc_retryable(error) or is_http_retryable(error)
+    return is_tcp_retryable(error) or is_http_retryable(error)
 
 
 def retryable(fn, protocol=None):

riak/riak_error.py

@@ -21,8 +21,12 @@ class RiakError(Exception):
     """
     Base class for exceptions generated in the Riak API.
     """
-    def __init__(self, value):
-        self.value = value
+    def __init__(self, *args, **kwargs):
+        super(RiakError, self).__init__(*args, **kwargs)
+        if len(args) > 0:
+            self.value = args[0]
+        else:
+            self.value = 'unknown'
 
     def __str__(self):
         return repr(self.value)
@@ -34,5 +38,5 @@ class ConflictError(RiakError):
     :class:`~riak.riak_object.RiakObject` that has more than one
     sibling.
     """
-    def __init__(self, message="Object in conflict"):
+    def __init__(self, message='Object in conflict'):
         super(ConflictError, self).__init__(message)

riak/tests/test_btypes.py

@@ -151,13 +151,18 @@ def test_multiget_bucket_types(self):
             self.assertEqual(btype, mobj.bucket.bucket_type)
 
     def test_write_once_bucket_type(self):
-        btype = self.client.bucket_type('write_once')
-        bucket = btype.bucket(self.bucket_name)
-
-        for i in range(100):
-            obj = bucket.new(self.key_name + str(i))
-            obj.data = {'id': i}
-            obj.store()
+        bt = 'write_once'
+        skey = 'write_once-init'
+        btype = self.client.bucket_type(bt)
+        bucket = btype.bucket(bt)
+        sobj = bucket.get(skey)
+        if not sobj.exists:
+            for i in range(100):
+                o = bucket.new(self.key_name + str(i))
+                o.data = {'id': i}
+                o.store()
+            o = bucket.new(skey, data={'id': skey})
+            o.store()
 
         mget = bucket.multiget([self.key_name + str(i) for i in range(100)])
         for mobj in mget:

riak/tests/test_client.py

@@ -3,6 +3,7 @@
 from six import PY2
 from threading import Thread
 from riak.riak_object import RiakObject
+from riak.transports.tcp import TcpTransport
 from riak.tests import DUMMY_HTTP_PORT, DUMMY_PB_PORT, RUN_POOL
 from riak.tests.base import IntegrationTestBase
 
@@ -13,6 +14,17 @@
 
 
 class ClientTests(IntegrationTestBase, unittest.TestCase):
+    def test_can_set_tcp_keepalive(self):
+        if self.protocol == 'pbc':
+            topts = {'socket_keepalive': True}
+            c = self.create_client(transport_options=topts)
+            for i, r in enumerate(c._tcp_pool.resources):
+                self.assertIsInstance(r, TcpTransport)
+                self.assertTrue(r._socket_keepalive)
+            c.close()
+        else:
+            pass
+
     def test_uses_client_id_if_given(self):
         if self.protocol == 'pbc':
             zero_client_id = "\0\0\0\0"

riak/tests/test_kv.py

@@ -180,17 +180,29 @@ def test_string_bucket_name(self):
     def test_generate_key(self):
         # Ensure that Riak generates a random key when
         # the key passed to bucket.new() is None.
-        bucket = self.client.bucket('random_key_bucket')
-        existing_keys = bucket.get_keys()
+        bucket = self.client.bucket(self.bucket_name)
         o = bucket.new(None, data={})
         self.assertIsNone(o.key)
         o.store()
         self.assertIsNotNone(o.key)
         self.assertNotIn('/', o.key)
-        self.assertNotIn(o.key, existing_keys)
-        self.assertEqual(len(bucket.get_keys()), len(existing_keys) + 1)
+        existing_keys = bucket.get_keys()
+        self.assertEqual(len(existing_keys), 1)
+
+    def maybe_store_keys(self):
+        skey = 'rkb-init'
+        bucket = self.client.bucket('random_key_bucket')
+        sobj = bucket.get(skey)
+        if sobj.exists:
+            return
+        for key in range(1, 1000):
+            o = bucket.new(None, data={})
+            o.store()
+        o = bucket.new(skey, data={})
+        o.store()
 
     def test_stream_keys(self):
+        self.maybe_store_keys()
         bucket = self.client.bucket('random_key_bucket')
         regular_keys = bucket.get_keys()
         self.assertNotEqual(len(regular_keys), 0)
@@ -203,10 +215,8 @@ def test_stream_keys(self):
         self.assertEqual(sorted(regular_keys), sorted(streamed_keys))
 
     def test_stream_keys_timeout(self):
+        self.maybe_store_keys()
         bucket = self.client.bucket('random_key_bucket')
-        for key in range(1, 1000):
-            o = bucket.new(None, data={})
-            o.store()
         streamed_keys = []
         with self.assertRaises(RiakError):
             for keylist in self.client.stream_keys(bucket, timeout=1):
@@ -216,6 +226,7 @@ def test_stream_keys_timeout(self):
                 streamed_keys += keylist
 
     def test_stream_keys_abort(self):
+        self.maybe_store_keys()
         bucket = self.client.bucket('random_key_bucket')
         regular_keys = bucket.get_keys()
         self.assertNotEqual(len(regular_keys), 0)

riak/transports/tcp/__init__.py

@@ -42,7 +42,7 @@ def destroy_resource(self, tcp):
 def is_retryable(err):
     """
     Determines if the given exception is something that is
-    network/socket-related and should thus cause the PBC connection to
+    network/socket-related and should thus cause the TCP connection to
     close and the operation retried on another node.
 
     :rtype: boolean