THRIFT-1103. py: TZlibTransport for python, a zlib compressed transport
This patch adds a new TZlibTransport to the Python library and extends the test suite to exercise it.
Patch: Will Pierce
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1084276 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/py/TestServer.py b/test/py/TestServer.py
index 99d925a..fa62765 100755
--- a/test/py/TestServer.py
+++ b/test/py/TestServer.py
@@ -28,64 +28,76 @@
from ThriftTest.ttypes import *
from thrift.transport import TTransport
from thrift.transport import TSocket
+from thrift.transport import TZlibTransport
from thrift.protocol import TBinaryProtocol
from thrift.protocol import TCompactProtocol
from thrift.server import TServer, TNonblockingServer, THttpServer
+PROT_FACTORIES = {'binary': TBinaryProtocol.TBinaryProtocolFactory,
+ 'accel': TBinaryProtocol.TBinaryProtocolAcceleratedFactory,
+ 'compact': TCompactProtocol.TCompactProtocolFactory}
+
parser = OptionParser()
-parser.set_defaults(port=9090, verbose=1, proto='binary')
parser.add_option("--port", type="int", dest="port",
help="port number for server to listen on")
+parser.add_option("--zlib", action="store_true", dest="zlib",
+ help="use zlib wrapper for compressed transport")
+parser.add_option("--ssl", action="store_true", dest="ssl",
+ help="use SSL for encrypted transport")
parser.add_option('-v', '--verbose', action="store_const",
dest="verbose", const=2,
help="verbose output")
+parser.add_option('-q', '--quiet', action="store_const",
+ dest="verbose", const=0,
+ help="minimal output")
parser.add_option('--proto', dest="proto", type="string",
help="protocol to use, one of: accel, binary, compact")
+parser.set_defaults(port=9090, verbose=1, proto='binary')
options, args = parser.parse_args()
class TestHandler:
def testVoid(self):
- if options.verbose:
+ if options.verbose > 1:
print 'testVoid()'
def testString(self, str):
- if options.verbose:
+ if options.verbose > 1:
print 'testString(%s)' % str
return str
def testByte(self, byte):
- if options.verbose:
+ if options.verbose > 1:
print 'testByte(%d)' % byte
return byte
def testI16(self, i16):
- if options.verbose:
+ if options.verbose > 1:
print 'testI16(%d)' % i16
return i16
def testI32(self, i32):
- if options.verbose:
+ if options.verbose > 1:
print 'testI32(%d)' % i32
return i32
def testI64(self, i64):
- if options.verbose:
+ if options.verbose > 1:
print 'testI64(%d)' % i64
return i64
def testDouble(self, dub):
- if options.verbose:
+ if options.verbose > 1:
print 'testDouble(%f)' % dub
return dub
def testStruct(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testStruct({%s, %d, %d, %d})' % (thing.string_thing, thing.byte_thing, thing.i32_thing, thing.i64_thing)
return thing
def testException(self, str):
- if options.verbose:
+ if options.verbose > 1:
print 'testException(%s)' % str
if str == 'Xception':
x = Xception()
@@ -96,90 +108,111 @@
raise ValueError("foo")
def testOneway(self, seconds):
- if options.verbose:
+ if options.verbose > 1:
print 'testOneway(%d) => sleeping...' % seconds
time.sleep(seconds / 3) # be quick
- if options.verbose:
+ if options.verbose > 1:
print 'done sleeping'
def testNest(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testNest(%s)' % thing
return thing
def testMap(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testMap(%s)' % thing
return thing
def testSet(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testSet(%s)' % thing
return thing
def testList(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testList(%s)' % thing
return thing
def testEnum(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testEnum(%s)' % thing
return thing
def testTypedef(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testTypedef(%s)' % thing
return thing
def testMapMap(self, thing):
- if options.verbose:
+ if options.verbose > 1:
print 'testMapMap(%s)' % thing
return thing
def testMulti(self, arg0, arg1, arg2, arg3, arg4, arg5):
- if options.verbose:
+ if options.verbose > 1:
print 'testMulti(%s)' % [arg0, arg1, arg2, arg3, arg4, arg5]
x = Xtruct(byte_thing=arg0, i32_thing=arg1, i64_thing=arg2)
return x
-if options.proto == 'binary':
- pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-elif options.proto == 'accel':
- pfactory = TBinaryProtocol.TBinaryProtocolAcceleratedFactory()
-elif options.proto == 'compact':
- pfactory = TCompactProtocol.TCompactProtocolFactory()
-else:
+# set up the protocol factory form the --proto option
+pfactory_cls = PROT_FACTORIES.get(options.proto, None)
+if pfactory_cls is None:
raise AssertionError('Unknown --proto option: %s' % options.proto)
+pfactory = pfactory_cls()
+
+# get the server type (TSimpleServer, TNonblockingServer, etc...)
+if len(args) > 1:
+ raise AssertionError('Only one server type may be specified, not multiple types.')
+server_type = args[0]
+
+# Set up the handler and processor objects
handler = TestHandler()
processor = ThriftTest.Processor(handler)
-if args[0] == "THttpServer":
- server = THttpServer.THttpServer(processor, ('', options.port), pfactory)
+# Handle THttpServer as a special case
+if server_type == 'THttpServer':
+ server =THttpServer.THttpServer(processor, ('', options.port), pfactory)
+ server.serve()
+ sys.exit(0)
+
+# set up server transport and transport factory
+host = None
+if options.ssl:
+ from thrift.transport import TSSLSocket
+ transport = TSSLSocket.TSSLServerSocket(host, options.port, certfile='test_cert.pem')
else:
- host = None
transport = TSocket.TServerSocket(host, options.port)
- tfactory = TTransport.TBufferedTransportFactory()
+tfactory = TTransport.TBufferedTransportFactory()
- if args[0] == "TNonblockingServer":
- server = TNonblockingServer.TNonblockingServer(processor, transport, inputProtocolFactory=pfactory)
- elif args[0] == "TProcessPoolServer":
- import signal
- def set_alarm():
- def clean_shutdown(signum, frame):
- for worker in server.workers:
+# if --zlib, then wrap server transport, and use a different transport factory
+if options.zlib:
+ transport = TZlibTransport.TZlibTransport(transport) # wrap with zlib
+ tfactory = TZlibTransport.TZlibTransportFactory()
+
+# do server-specific setup here:
+if server_type == "TNonblockingServer":
+ server = TNonblockingServer.TNonblockingServer(processor, transport, inputProtocolFactory=pfactory)
+elif server_type == "TProcessPoolServer":
+ import signal
+ from thrift.server import TProcessPoolServer
+ server = TProcessPoolServer.TProcessPoolServer(processor, transport, tfactory, pfactory)
+ server.setNumWorkers(5)
+ def set_alarm():
+ def clean_shutdown(signum, frame):
+ for worker in server.workers:
+ if options.verbose > 0:
print 'Terminating worker: %s' % worker
- worker.terminate()
+ worker.terminate()
+ if options.verbose > 0:
print 'Requesting server to stop()'
- server.stop()
- signal.signal(signal.SIGALRM, clean_shutdown)
- signal.alarm(2)
- from thrift.server import TProcessPoolServer
- server = TProcessPoolServer.TProcessPoolServer(processor, transport, tfactory, pfactory)
- server.setNumWorkers(5)
- set_alarm()
- else:
- ServerClass = getattr(TServer, args[0])
- server = ServerClass(processor, transport, tfactory, pfactory)
-
+ server.stop()
+ signal.signal(signal.SIGALRM, clean_shutdown)
+ signal.alarm(2)
+ set_alarm()
+else:
+ # look up server class dynamically to instantiate server
+ ServerClass = getattr(TServer, server_type)
+ server = ServerClass(processor, transport, tfactory, pfactory)
+# enter server main loop
server.serve()