WIP 0.20

CHANGES.rst

@@ -1,10 +1,19 @@
 Changes by Version
 ==================
 
-0.19.1 (unreleased)
--------------------
-
-- Nothing changed yet.
+0.20.0 (unreleased)
+-------------------
+
+- **BREAKING** - Removed support for the Apache ``thrift`` library.
+- **BREAKING** - Removed ``tchannel.thrift.client_for`` and
+  ``tchannel.sync.thrift.client_for`` as planned in 0.18.
+- **BREAKING** - Removed ``tchannel.thrift_request_builder`` as
+  planned in 0.18.
+- Reduced Zipkin submission failures to warnings.
+- Limit the size of arg1 to 16KB.
+- Fix bug which prevented requests from being retried if the candidate
+  connection was previously terminated.
+- Support thriftrw 1.0.
 
 
 0.19.0 (2015-11-06)

Makefile

@@ -72,11 +72,3 @@ docs:
 .PHONY: docsopen
 docsopen: docs
 	open docs/_build/html/index.html
-
-.PHONY: vcr-thrift
-vcr-thrift:
-	make -C ./tchannel/testing/vcr all
-
-.PHONY: gen_thrift
-gen_thrift:
-    thrift --gen py:new_style,slots,dynamic -out tests/data/generated tests/data/idls/ThriftTest.thrift

requirements-test.txt

@@ -15,6 +15,18 @@ psutil
 # Test all the pythons
 tox
 
+#
+# futures is installed implicitly through threadloop,
+# but tox has an issue where it doesn't pick that up,
+# causing tests to fail. This can be reproduced locally
+# by removing futures from this file and running:
+#
+#     tox -e py27 tests
+#
+# @see https://travis-ci.org/uber/tchannel-python/jobs/86710564
+#
+futures
+
 # Syntax checker
 flake8==2.2.5
 

setup.cfg

@@ -2,16 +2,6 @@
 create-wheel = yes
 python-file-with-version = tchannel/__init__.py
 
-[flake8]
-# Ignore files generated by Thrift
-exclude =
-  examples/guide/keyvalue/keyvalue/service/*,
-  examples/benchmark/thrift/service/*,
-  tchannel/health/thrift/*,
-  tchannel/zipkin/thrift/*,
-  tchannel/testing/vcr/proxy/*,
-  tests/data/generated/ThriftTest/*
-
 [pytest]
 markers =
   call: mark a test as using the client's calling API.

setup.py

@@ -22,14 +22,13 @@
     install_requires=[
         # stdlib backports, no constraints needed
         'contextlib2',
-        'futures',
 
         # external deps
         'crcmod>=1,<2',
         'tornado>=4.2,<5',
 
         # tchannel deps
-        'thriftrw>=0.4,<0.6',
+        'thriftrw>=1,<2',
         'threadloop>=1,<2',
     ],
     extras_require={

tchannel/__init__.py

@@ -28,4 +28,3 @@
 from .response import Response  # noqa
 from .request import Request  # noqa
 from .tchannel import TChannel  # noqa
-from .thrift import thrift_request_builder  # noqa

tchannel/glossary.py

@@ -31,6 +31,9 @@
 # CallRequestMessage uses it as the default TTL value for the message.
 DEFAULT_TIMEOUT = 30  # seconds
 
+# Max size of arg1.
+MAX_SIZE_OF_ARG1 = 16 * 1024
+
 TCHANNEL_LANGUAGE = 'python'
 
 # python environment, eg 'CPython-2.7.10'

tchannel/schemes/thrift.py

@@ -141,24 +141,18 @@ def __call__(
         )
         body = serializer.deserialize_body(body=response.body)
 
+        # TODO read_body and get_serializer were added so that we could fork
+        # behavior on whether Apache Thrift was being used or thriftrw. That's
+        # no longer required. Move that behavior back here.
         response.body = request.read_body(body)
         raise gen.Return(response)
 
     def register(self, thrift_module, **kwargs):
         # dat circular import
         from tchannel.thrift import rw as thriftrw
-
-        if isinstance(thrift_module, thriftrw.Service):
-            # Dirty hack to support thriftrw and old API
-            return thriftrw.register(
-                # TODO drop deprecated tchannel
-                self._tchannel._dep_tchannel._handler,
-                thrift_module,
-                **kwargs
-            )
-        else:
-            return self._tchannel.register(
-                scheme=self.NAME,
-                endpoint=thrift_module,
-                **kwargs
-            )
+        return thriftrw.register(
+            # TODO drop deprecated tchannel
+            self._tchannel._dep_tchannel._handler,
+            thrift_module,
+            **kwargs
+        )

tchannel/serializer/thrift.py

@@ -39,7 +39,10 @@ class ThriftSerializer(object):
         rw.len_prefixed_string(rw.number(2)),
     )
 
-    def __init__(self, deserialize_type):
+    __slots__ = ('module', 'deserialize_type')
+
+    def __init__(self, module, deserialize_type):
+        self.module = module
         self.deserialize_type = deserialize_type
 
     def serialize_header(self, headers):
@@ -56,49 +59,6 @@ def deserialize_header(self, headers):
 
         return result
 
-    def serialize_body(self, call_args):
-
-        # TODO - use fastbinary directly
-        #
-        # fastbinary.encode_binary(
-        #     call_args, (call_args.__class__, call_args.thrift_spec)
-        # )
-        # fastbinary.decode_binary(
-        #    result, TMemoryBuffer(body),(result_type, result_type.thrift_spec)
-        # )
-        #
-        from thrift.protocol import TBinaryProtocol
-        from thrift.transport import TTransport
-        trans = TTransport.TMemoryBuffer()
-        proto = TBinaryProtocol.TBinaryProtocolAccelerated(trans)
-        call_args.write(proto)
-        result = trans.getvalue()
-
-        return result
-
-    def deserialize_body(self, body):
-        from thrift.protocol import TBinaryProtocol
-        from thrift.transport import TTransport
-        trans = TTransport.TMemoryBuffer(body)
-        proto = TBinaryProtocol.TBinaryProtocolAccelerated(trans)
-
-        result = self.deserialize_type()
-        result.read(proto)
-        return result
-
-
-class ThriftRWSerializer(ThriftSerializer):
-
-    def __init__(self, module, deserialize_type):
-        """
-        :param module:
-            thriftrw generated module
-        """
-        # TODO export dumps/loads on classes in thriftrw in addition to
-        # module-level dumps/loads.
-        super(ThriftRWSerializer, self).__init__(deserialize_type)
-        self.module = module
-
     def serialize_body(self, obj):
         return self.module.dumps(obj)
 

tchannel/thrift/__init__.py

@@ -20,7 +20,4 @@
 
 from __future__ import absolute_import
 
-from .client import client_for  # noqa
-from .module import thrift_request_builder  # noqa
-from .server import register  # noqa
 from .rw import load  # noqa