You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2023/02/27 20:40:10 UTC
[impala] branch master updated: IMPALA-11624: Bump Impyla dependency to 0.18.0
This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new a9cfc7b33 IMPALA-11624: Bump Impyla dependency to 0.18.0
a9cfc7b33 is described below
commit a9cfc7b33f43749a199730d1628a6db870a8f5ff
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Thu Feb 23 15:31:54 2023 -0800
IMPALA-11624: Bump Impyla dependency to 0.18.0
IMPALA_THRIFT_PY_VERSION is also bumped to 0.16.0p3.
As 0.16.0p3 Thrift does not contain Python related
patches and Impyla 0.18.0 depends on Thrift 0.16.0,
now we are consistently using Thrift 0.16.0 in all
Python code. This also bumps the Thrift in the
shell's ext-py directory to 0.16.0 (based on the
Thrift 0.16.0 pypi tarball with the egg directory
removed).
Testing:
- Ran a GVO job
Change-Id: I7265558b0e07959c606cba73cd251c3edfcb3ed5
Reviewed-on: http://gerrit.cloudera.org:8080/18456
Reviewed-by: Michael Smith <mi...@cloudera.com>
Reviewed-by: Wenzhe Zhou <wz...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
Reviewed-by: Joe McDonnell <jo...@cloudera.com>
---
bin/impala-config.sh | 2 +-
bin/rat_exclude_files.txt | 2 +-
infra/python/deps/requirements.txt | 2 +-
shell/.gitignore | 7 +-
shell/ext-py/thrift-0.14.2/CMakeLists.txt | 37 ---
shell/ext-py/thrift-0.14.2/Makefile.am | 79 ------
shell/ext-py/thrift-0.14.2/coding_standards.md | 7 -
shell/ext-py/thrift-0.14.2/compat/win32/stdint.h | 247 ------------------
shell/ext-py/thrift-0.14.2/setup.cfg | 6 -
.../thrift-0.14.2/test/_import_local_thrift.py | 30 ---
.../test/test_thrift_file/TestServer.thrift | 23 --
.../thrift-0.14.2/test/thrift_TBinaryProtocol.py | 264 -------------------
.../thrift-0.14.2/test/thrift_TCompactProtocol.py | 288 ---------------------
.../test/thrift_TNonblockingServer.py | 101 --------
.../thrift-0.14.2/test/thrift_TZlibTransport.py | 99 -------
shell/ext-py/thrift-0.14.2/test/thrift_json.py | 116 ---------
.../ext-py/thrift-0.14.2/test/thrift_transport.py | 70 -----
.../{thrift-0.14.2 => thrift-0.16.0}/MANIFEST.in | 0
.../{thrift-0.14.2 => thrift-0.16.0}/README.md | 0
shell/ext-py/thrift-0.16.0/setup.cfg | 13 +
.../{thrift-0.14.2 => thrift-0.16.0}/setup.py | 18 +-
.../src/TMultiplexedProcessor.py | 0
.../src/TRecursive.py | 0
.../{thrift-0.14.2 => thrift-0.16.0}/src/TSCons.py | 0
.../src/TSerialization.py | 0
.../src/TTornado.py | 0
.../{thrift-0.14.2 => thrift-0.16.0}/src/Thrift.py | 0
.../src/__init__.py | 0
.../{thrift-0.14.2 => thrift-0.16.0}/src/compat.py | 0
.../src/ext/binary.cpp | 1 +
.../src/ext/binary.h | 0
.../src/ext/compact.cpp | 1 +
.../src/ext/compact.h | 0
.../src/ext/endian.h | 0
.../src/ext/module.cpp | 0
.../src/ext/protocol.h | 0
.../src/ext/protocol.tcc | 0
.../src/ext/types.cpp | 0
.../src/ext/types.h | 0
.../src/protocol/TBase.py | 0
.../src/protocol/TBinaryProtocol.py | 0
.../src/protocol/TCompactProtocol.py | 0
.../src/protocol/THeaderProtocol.py | 0
.../src/protocol/TJSONProtocol.py | 0
.../src/protocol/TMultiplexedProtocol.py | 0
.../src/protocol/TProtocol.py | 0
.../src/protocol/TProtocolDecorator.py | 0
.../src/protocol/__init__.py | 0
.../src/server/THttpServer.py | 0
.../src/server/TNonblockingServer.py | 0
.../src/server/TProcessPoolServer.py | 5 +
.../src/server/TServer.py | 0
.../src/server/__init__.py | 0
.../src/transport/THeaderTransport.py | 0
.../src/transport/THttpClient.py | 0
.../src/transport/TSSLSocket.py | 0
.../src/transport/TSocket.py | 0
.../src/transport/TTransport.py | 3 +
.../src/transport/TTwisted.py | 0
.../src/transport/TZlibTransport.py | 0
.../src/transport/__init__.py | 0
.../src/transport/sslcompat.py | 0
.../test/test_socket.py | 0
.../test/test_sslsocket.py | 0
shell/packaging/requirements.txt | 2 +-
65 files changed, 48 insertions(+), 1375 deletions(-)
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 1ac293676..89ac731d1 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -193,7 +193,7 @@ else
export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p3
fi
unset IMPALA_THRIFT_JAVA_URL
-export IMPALA_THRIFT_PY_VERSION=0.11.0-p5
+export IMPALA_THRIFT_PY_VERSION=0.16.0-p3
unset IMPALA_THRIFT_PY_URL
if [[ $OSTYPE == "darwin"* ]]; then
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index bce479c73..19d4ecbf2 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -51,7 +51,7 @@ shell/ext-py/prettytable-0.7.2/*
shell/ext-py/sasl-0.3.1/*
shell/ext-py/six-1.14.0/*
shell/ext-py/sqlparse-0.3.1/*
-shell/ext-py/thrift-0.14.2/*
+shell/ext-py/thrift-0.16.0/*
shell/ext-py/thrift_sasl-0.4.3/*
www/d3.v3.min.js
www/jquery/jquery-3.5.1.min.js
diff --git a/infra/python/deps/requirements.txt b/infra/python/deps/requirements.txt
index 59be69e9c..8f8ada7a7 100644
--- a/infra/python/deps/requirements.txt
+++ b/infra/python/deps/requirements.txt
@@ -45,7 +45,7 @@ hdfs == 2.0.2
docopt == 0.6.2
execnet == 1.4.0
apipkg == 1.4
-impyla == 0.18a1
+impyla == 0.18.0
bitarray == 2.3.0
pure-sasl == 0.6.2
# six == 1.14.0 (specified separately)
diff --git a/shell/.gitignore b/shell/.gitignore
index c560cb661..40ec1a890 100644
--- a/shell/.gitignore
+++ b/shell/.gitignore
@@ -18,9 +18,9 @@ ext-py/six-1.14.0/six.egg-info/
ext-py/sqlparse-0.3.1/dist/
ext-py/sqlparse-0.3.1/build/
ext-py/sqlparse-0.3.1/sqlparse.egg-info/
-ext-py/thrift-0.14.2/dist/
-ext-py/thrift-0.14.2/build/
-ext-py/thrift-0.14.2/thrift.egg-info/
+ext-py/thrift-0.16.0/dist/
+ext-py/thrift-0.16.0/build/
+ext-py/thrift-0.16.0/thrift.egg-info/
ext-py/thrift_sasl-0.4.3/dist/
ext-py/thrift_sasl-0.4.3/build/
ext-py/thrift_sasl-0.4.3/thrift_sasl.egg-info/
@@ -37,5 +37,6 @@ ext-py/sasl-0.2.1/
ext-py/six-1.11.0/
ext-py/sqlparse-0.1.7/
ext-py/sqlparse-0.1.19/
+ext-py/thrift-0.14.2/
ext-py/thrift_sasl-0.4.1/
ext-py/thrift_sasl-0.4.2/
diff --git a/shell/ext-py/thrift-0.14.2/CMakeLists.txt b/shell/ext-py/thrift-0.14.2/CMakeLists.txt
deleted file mode 100644
index 9c4368b6b..000000000
--- a/shell/ext-py/thrift-0.14.2/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include_directories(${PYTHON_INCLUDE_DIRS})
-
-add_custom_target(python_build ALL
- COMMAND ${THRIFT_COMPILER} --gen py test/test_thrift_file/TestServer.thrift
- COMMAND ${PYTHON_EXECUTABLE} setup.py build
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "Building Python library"
-)
-
-if(BUILD_TESTING)
- add_test(PythonTestSSLSocket ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/test_sslsocket.py)
- add_test(PythonThriftJson ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_json.py)
- add_test(PythonThriftTransport ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_transport.py)
- add_test(PythonThriftTBinaryProtocol ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TBinaryProtocol.py)
- add_test(PythonThriftTZlibTransport ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TZlibTransport.py)
- add_test(PythonThriftProtocol ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TCompactProtocol.py)
- add_test(PythonThriftTNonblockingServer ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TNonblockingServer.py)
-endif()
diff --git a/shell/ext-py/thrift-0.14.2/Makefile.am b/shell/ext-py/thrift-0.14.2/Makefile.am
deleted file mode 100644
index b16305790..000000000
--- a/shell/ext-py/thrift-0.14.2/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = serial-tests
-DESTDIR ?= /
-
-if WITH_PY3
-py3-build:
- $(PYTHON3) setup.py build
-py3-test: py3-build
- $(PYTHON3) test/thrift_json.py
- $(PYTHON3) test/thrift_transport.py
- $(PYTHON3) test/test_sslsocket.py
- $(PYTHON3) test/thrift_TBinaryProtocol.py
- $(PYTHON3) test/thrift_TZlibTransport.py
- $(PYTHON3) test/thrift_TCompactProtocol.py
- $(PYTHON3) test/thrift_TNonblockingServer.py
-else
-py3-build:
-py3-test:
-endif
-
-all-local: py3-build
- $(PYTHON) setup.py build
- ${THRIFT} --gen py test/test_thrift_file/TestServer.thrift
-
-# We're ignoring prefix here because site-packages seems to be
-# the equivalent of /usr/local/lib in Python land.
-# Old version (can't put inline because it's not portable).
-#$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
-install-exec-hook:
- $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
-
-check-local: all py3-test
- $(PYTHON) test/thrift_json.py
- $(PYTHON) test/thrift_transport.py
- $(PYTHON) test/test_sslsocket.py
- $(PYTHON) test/test_socket.py
- $(PYTHON) test/thrift_TBinaryProtocol.py
- $(PYTHON) test/thrift_TZlibTransport.py
- $(PYTHON) test/thrift_TCompactProtocol.py
- $(PYTHON) test/thrift_TNonblockingServer.py
-
-
-clean-local:
- $(RM) -r build
- $(RM) -r gen-py
- find . -type f \( -iname "*.pyc" \) | xargs rm -f
- find . -type d \( -iname "__pycache__" -or -iname "_trial_temp" \) | xargs rm -rf
-
-dist-hook:
- find $(distdir) -type f \( -iname "*.pyc" \) | xargs rm -f
- find $(distdir) -type d \( -iname "__pycache__" -or -iname "_trial_temp" \) | xargs rm -rf
-
-EXTRA_DIST = \
- CMakeLists.txt \
- MANIFEST.in \
- coding_standards.md \
- compat \
- setup.py \
- setup.cfg \
- src \
- test \
- README.md
diff --git a/shell/ext-py/thrift-0.14.2/coding_standards.md b/shell/ext-py/thrift-0.14.2/coding_standards.md
deleted file mode 100644
index 4c560b524..000000000
--- a/shell/ext-py/thrift-0.14.2/coding_standards.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Python Coding Standards
-
-Please follow:
- * [Thrift General Coding Standards](/doc/coding_standards.md)
- * Code Style for Python Code [PEP8](http://legacy.python.org/dev/peps/pep-0008/)
-
-When in doubt - check with <http://www.pylint.org/> or online with <http://pep8online.com>.
diff --git a/shell/ext-py/thrift-0.14.2/compat/win32/stdint.h b/shell/ext-py/thrift-0.14.2/compat/win32/stdint.h
deleted file mode 100644
index d02608a59..000000000
--- a/shell/ext-py/thrift-0.14.2/compat/win32/stdint.h
+++ /dev/null
@@ -1,247 +0,0 @@
-// ISO C9x compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
-// Copyright (c) 2006-2008 Alexander Chemeris
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. The name of the author may be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifdef __cplusplus
-extern "C" {
-#endif
-# include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-# define _W64 __w64
-# else
-# define _W64
-# endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
- typedef signed char int8_t;
- typedef signed short int16_t;
- typedef signed int int32_t;
- typedef unsigned char uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned int uint32_t;
-#else
- typedef signed __int8 int8_t;
- typedef signed __int16 int16_t;
- typedef signed __int32 int32_t;
- typedef unsigned __int8 uint8_t;
- typedef unsigned __int16 uint16_t;
- typedef unsigned __int32 uint32_t;
-#endif
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t int_least8_t;
-typedef int16_t int_least16_t;
-typedef int32_t int_least32_t;
-typedef int64_t int_least64_t;
-typedef uint8_t uint_least8_t;
-typedef uint16_t uint_least16_t;
-typedef uint32_t uint_least32_t;
-typedef uint64_t uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t int_fast8_t;
-typedef int16_t int_fast16_t;
-typedef int32_t int_fast32_t;
-typedef int64_t int_fast64_t;
-typedef uint8_t uint_fast8_t;
-typedef uint16_t uint_fast16_t;
-typedef uint32_t uint_fast32_t;
-typedef uint64_t uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
- typedef signed __int64 intptr_t;
- typedef unsigned __int64 uintptr_t;
-#else // _WIN64 ][
- typedef _W64 signed int intptr_t;
- typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t intmax_t;
-typedef uint64_t uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN ((int8_t)_I8_MIN)
-#define INT8_MAX _I8_MAX
-#define INT16_MIN ((int16_t)_I16_MIN)
-#define INT16_MAX _I16_MAX
-#define INT32_MIN ((int32_t)_I32_MIN)
-#define INT32_MAX _I32_MAX
-#define INT64_MIN ((int64_t)_I64_MIN)
-#define INT64_MAX _I64_MAX
-#define UINT8_MAX _UI8_MAX
-#define UINT16_MAX _UI16_MAX
-#define UINT32_MAX _UI32_MAX
-#define UINT64_MAX _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN INT8_MIN
-#define INT_LEAST8_MAX INT8_MAX
-#define INT_LEAST16_MIN INT16_MIN
-#define INT_LEAST16_MAX INT16_MAX
-#define INT_LEAST32_MIN INT32_MIN
-#define INT_LEAST32_MAX INT32_MAX
-#define INT_LEAST64_MIN INT64_MIN
-#define INT_LEAST64_MAX INT64_MAX
-#define UINT_LEAST8_MAX UINT8_MAX
-#define UINT_LEAST16_MAX UINT16_MAX
-#define UINT_LEAST32_MAX UINT32_MAX
-#define UINT_LEAST64_MAX UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN INT8_MIN
-#define INT_FAST8_MAX INT8_MAX
-#define INT_FAST16_MIN INT16_MIN
-#define INT_FAST16_MAX INT16_MAX
-#define INT_FAST32_MIN INT32_MIN
-#define INT_FAST32_MAX INT32_MAX
-#define INT_FAST64_MIN INT64_MIN
-#define INT_FAST64_MAX INT64_MAX
-#define UINT_FAST8_MAX UINT8_MAX
-#define UINT_FAST16_MAX UINT16_MAX
-#define UINT_FAST32_MAX UINT32_MAX
-#define UINT_FAST64_MAX UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-# define INTPTR_MIN INT64_MIN
-# define INTPTR_MAX INT64_MAX
-# define UINTPTR_MAX UINT64_MAX
-#else // _WIN64 ][
-# define INTPTR_MIN INT32_MIN
-# define INTPTR_MAX INT32_MAX
-# define UINTPTR_MAX UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN INT64_MIN
-#define INTMAX_MAX INT64_MAX
-#define UINTMAX_MAX UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-# define PTRDIFF_MIN _I64_MIN
-# define PTRDIFF_MAX _I64_MAX
-#else // _WIN64 ][
-# define PTRDIFF_MIN _I32_MIN
-# define PTRDIFF_MAX _I32_MAX
-#endif // _WIN64 ]
-
-#define SIG_ATOMIC_MIN INT_MIN
-#define SIG_ATOMIC_MAX INT_MAX
-
-#ifndef SIZE_MAX // [
-# ifdef _WIN64 // [
-# define SIZE_MAX _UI64_MAX
-# else // _WIN64 ][
-# define SIZE_MAX _UI32_MAX
-# endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-# define WCHAR_MIN 0
-#endif // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-# define WCHAR_MAX _UI16_MAX
-#endif // WCHAR_MAX ]
-
-#define WINT_MIN 0
-#define WINT_MAX _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val) val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val) val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C INT64_C
-#define UINTMAX_C UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]
diff --git a/shell/ext-py/thrift-0.14.2/setup.cfg b/shell/ext-py/thrift-0.14.2/setup.cfg
deleted file mode 100644
index c9ed0aec5..000000000
--- a/shell/ext-py/thrift-0.14.2/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[install]
-optimize = 1
-[metadata]
-description-file = README.md
-[flake8]
-max-line-length = 100
diff --git a/shell/ext-py/thrift-0.14.2/test/_import_local_thrift.py b/shell/ext-py/thrift-0.14.2/test/_import_local_thrift.py
deleted file mode 100644
index d22312298..000000000
--- a/shell/ext-py/thrift-0.14.2/test/_import_local_thrift.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import os
-import sys
-
-SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__))
-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(SCRIPT_DIR)))
-
-for libpath in glob.glob(os.path.join(ROOT_DIR, 'lib', 'py', 'build', 'lib.*')):
- if libpath.endswith('-%d.%d' % (sys.version_info[0], sys.version_info[1])):
- sys.path.insert(0, libpath)
- break
diff --git a/shell/ext-py/thrift-0.14.2/test/test_thrift_file/TestServer.thrift b/shell/ext-py/thrift-0.14.2/test/test_thrift_file/TestServer.thrift
deleted file mode 100644
index 0de8856a0..000000000
--- a/shell/ext-py/thrift-0.14.2/test/test_thrift_file/TestServer.thrift
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-service TestServer{
- string add_and_get_msg(1:string msg)
-}
diff --git a/shell/ext-py/thrift-0.14.2/test/thrift_TBinaryProtocol.py b/shell/ext-py/thrift-0.14.2/test/thrift_TBinaryProtocol.py
deleted file mode 100644
index f7d05ff97..000000000
--- a/shell/ext-py/thrift-0.14.2/test/thrift_TBinaryProtocol.py
+++ /dev/null
@@ -1,264 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import unittest
-
-import _import_local_thrift # noqa
-from thrift.protocol.TBinaryProtocol import TBinaryProtocol
-from thrift.transport import TTransport
-
-
-def testNaked(type, data):
- buf = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TBinaryProtocol(transport)
- if type.capitalize() == 'Byte':
- protocol.writeByte(data)
-
- if type.capitalize() == 'I16':
- protocol.writeI16(data)
-
- if type.capitalize() == 'I32':
- protocol.writeI32(data)
-
- if type.capitalize() == 'I64':
- protocol.writeI64(data)
-
- if type.capitalize() == 'String':
- protocol.writeString(data)
-
- if type.capitalize() == 'Double':
- protocol.writeDouble(data)
-
- if type.capitalize() == 'Binary':
- protocol.writeBinary(data)
-
- if type.capitalize() == 'Bool':
- protocol.writeBool(data)
-
- transport.flush()
- data_r = buf.getvalue()
- buf = TTransport.TMemoryBuffer(data_r)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TBinaryProtocol(transport)
- if type.capitalize() == 'Byte':
- return protocol.readByte()
-
- if type.capitalize() == 'I16':
- return protocol.readI16()
-
- if type.capitalize() == 'I32':
- return protocol.readI32()
-
- if type.capitalize() == 'I64':
- return protocol.readI64()
-
- if type.capitalize() == 'String':
- return protocol.readString()
-
- if type.capitalize() == 'Double':
- return protocol.readDouble()
-
- if type.capitalize() == 'Binary':
- return protocol.readBinary()
-
- if type.capitalize() == 'Bool':
- return protocol.readBool()
-
-
-def testField(type, data):
- TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12}
- buf = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TBinaryProtocol(transport)
- protocol.writeStructBegin('struct')
- protocol.writeFieldBegin("field", TType[type.capitalize()], 10)
- if type.capitalize() == 'Byte':
- protocol.writeByte(data)
-
- if type.capitalize() == 'I16':
- protocol.writeI16(data)
-
- if type.capitalize() == 'I32':
- protocol.writeI32(data)
-
- if type.capitalize() == 'I64':
- protocol.writeI64(data)
-
- if type.capitalize() == 'String':
- protocol.writeString(data)
-
- if type.capitalize() == 'Double':
- protocol.writeDouble(data)
-
- if type.capitalize() == 'Binary':
- protocol.writeBinary(data)
-
- if type.capitalize() == 'Bool':
- protocol.writeBool(data)
-
- protocol.writeFieldEnd()
- protocol.writeStructEnd()
-
- transport.flush()
- data_r = buf.getvalue()
-
- buf = TTransport.TMemoryBuffer(data_r)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TBinaryProtocol(transport)
- protocol.readStructBegin()
- protocol.readFieldBegin()
- if type.capitalize() == 'Byte':
- return protocol.readByte()
-
- if type.capitalize() == 'I16':
- return protocol.readI16()
-
- if type.capitalize() == 'I32':
- return protocol.readI32()
-
- if type.capitalize() == 'I64':
- return protocol.readI64()
-
- if type.capitalize() == 'String':
- return protocol.readString()
-
- if type.capitalize() == 'Double':
- return protocol.readDouble()
-
- if type.capitalize() == 'Binary':
- return protocol.readBinary()
-
- if type.capitalize() == 'Bool':
- return protocol.readBool()
-
- protocol.readFieldEnd()
- protocol.readStructEnd()
-
-
-def testMessage(data):
- message = {}
- message['name'] = data[0]
- message['type'] = data[1]
- message['seqid'] = data[2]
-
- buf = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TBinaryProtocol(transport)
- protocol.writeMessageBegin(message['name'], message['type'], message['seqid'])
- protocol.writeMessageEnd()
-
- transport.flush()
- data_r = buf.getvalue()
-
- buf = TTransport.TMemoryBuffer(data_r)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TBinaryProtocol(transport)
- result = protocol.readMessageBegin()
- protocol.readMessageEnd()
- return result
-
-
-class TestTBinaryProtocol(unittest.TestCase):
-
- def test_TBinaryProtocol_write_read(self):
- try:
- testNaked('Byte', 123)
- for i in range(0, 128):
- self.assertEqual(i, testField('Byte', i))
- self.assertEqual(-i, testField('Byte', -i))
-
- self.assertEqual(0, testNaked("I16", 0))
- self.assertEqual(1, testNaked("I16", 1))
- self.assertEqual(15000, testNaked("I16", 15000))
- self.assertEqual(0x7fff, testNaked("I16", 0x7fff))
- self.assertEqual(-1, testNaked("I16", -1))
- self.assertEqual(-15000, testNaked("I16", -15000))
- self.assertEqual(-0x7fff, testNaked("I16", -0x7fff))
- self.assertEqual(32767, testNaked("I16", 32767))
- self.assertEqual(-32768, testNaked("I16", -32768))
-
- self.assertEqual(0, testField("I16", 0))
- self.assertEqual(1, testField("I16", 1))
- self.assertEqual(7, testField("I16", 7))
- self.assertEqual(150, testField("I16", 150))
- self.assertEqual(15000, testField("I16", 15000))
- self.assertEqual(0x7fff, testField("I16", 0x7fff))
- self.assertEqual(-1, testField("I16", -1))
- self.assertEqual(-7, testField("I16", -7))
- self.assertEqual(-150, testField("I16", -150))
- self.assertEqual(-15000, testField("I16", -15000))
- self.assertEqual(-0xfff, testField("I16", -0xfff))
-
- self.assertEqual(0, testNaked("I32", 0))
- self.assertEqual(1, testNaked("I32", 1))
- self.assertEqual(15000, testNaked("I32", 15000))
- self.assertEqual(0xffff, testNaked("I32", 0xffff))
- self.assertEqual(-1, testNaked("I32", -1))
- self.assertEqual(-15000, testNaked("I32", -15000))
- self.assertEqual(-0xffff, testNaked("I32", -0xffff))
- self.assertEqual(2147483647, testNaked("I32", 2147483647))
- self.assertEqual(-2147483647, testNaked("I32", -2147483647))
-
- self.assertEqual(0, testField("I32", 0))
- self.assertEqual(1, testField("I32", 1))
- self.assertEqual(7, testField("I32", 7))
- self.assertEqual(150, testField("I32", 150))
- self.assertEqual(15000, testField("I32", 15000))
- self.assertEqual(31337, testField("I32", 31337))
- self.assertEqual(0xffff, testField("I32", 0xffff))
- self.assertEqual(0xffffff, testField("I32", 0xffffff))
- self.assertEqual(-1, testField("I32", -1))
- self.assertEqual(-7, testField("I32", -7))
- self.assertEqual(-150, testField("I32", -150))
- self.assertEqual(-15000, testField("I32", -15000))
- self.assertEqual(-0xffff, testField("I32", -0xffff))
- self.assertEqual(-0xffffff, testField("I32", -0xffffff))
-
- self.assertEqual(9223372036854775807, testNaked("I64", 9223372036854775807))
- self.assertEqual(-9223372036854775807, testNaked("I64", -9223372036854775807))
- self.assertEqual(-0, testNaked("I64", 0))
-
- self.assertEqual(True, testNaked("Bool", True))
- self.assertEqual(3.14159261, testNaked("Double", 3.14159261))
- self.assertEqual("hello thrift", testNaked("String", "hello thrift"))
- self.assertEqual(True, testField('Bool', True))
- self.assertEqual(3.1415926, testNaked("Double", 3.1415926))
- self.assertEqual("hello thrift", testNaked("String", "hello thrift"))
-
- TMessageType = {"T_CALL": 1, "T_REPLY": 2, "T_EXCEPTION": 3, "T_ONEWAY": 4}
- test_data = [("short message name", TMessageType['T_CALL'], 0),
- ("1", TMessageType['T_REPLY'], 12345),
- ("loooooooooooooooooooooooooooooooooong", TMessageType['T_EXCEPTION'], 1 << 16),
- ("one way push", TMessageType['T_ONEWAY'], 12),
- ("Janky", TMessageType['T_CALL'], 0)]
-
- for dt in test_data:
- result = testMessage(dt)
- self.assertEqual(result[0], dt[0])
- self.assertEqual(result[1], dt[1])
- self.assertEqual(result[2], dt[2])
-
- except Exception as e:
- print("Assertion fail")
- raise e
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/shell/ext-py/thrift-0.14.2/test/thrift_TCompactProtocol.py b/shell/ext-py/thrift-0.14.2/test/thrift_TCompactProtocol.py
deleted file mode 100644
index 1d6af8ee2..000000000
--- a/shell/ext-py/thrift-0.14.2/test/thrift_TCompactProtocol.py
+++ /dev/null
@@ -1,288 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import _import_local_thrift # noqa
-from thrift.protocol import TCompactProtocol
-from thrift.transport import TTransport
-import unittest
-
-CLEAR = 0
-FIELD_WRITE = 1
-VALUE_WRITE = 2
-CONTAINER_WRITE = 3
-BOOL_WRITE = 4
-FIELD_READ = 5
-CONTAINER_READ = 6
-VALUE_READ = 7
-BOOL_READ = 8
-
-
-def testNaked(type, data):
- buf = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TCompactProtocol.TCompactProtocol(transport)
-
- if type.capitalize() == 'Byte':
- protocol.state = VALUE_WRITE
- protocol.writeByte(data)
-
- elif type.capitalize() == 'I16':
- protocol.state = CONTAINER_WRITE
- protocol.writeI16(data)
-
- elif type.capitalize() == 'I32':
- protocol.state = CONTAINER_WRITE
- protocol.writeI32(data)
-
- elif type.capitalize() == 'I64':
- protocol.state = CONTAINER_WRITE
- protocol.writeI64(data)
-
- elif type.capitalize() == 'String':
- protocol.state = CONTAINER_WRITE
- protocol.writeString(data)
-
- elif type.capitalize() == 'Double':
- protocol.state = VALUE_WRITE
- protocol.writeDouble(data)
-
- elif type.capitalize() == 'Binary':
- protocol.state = FIELD_WRITE
- protocol.writeBinary(data)
-
- elif type.capitalize() == 'Bool':
- protocol.state = CONTAINER_WRITE
- protocol.writeBool(True)
-
- transport.flush()
- data_r = buf.getvalue()
- buf = TTransport.TMemoryBuffer(data_r)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TCompactProtocol.TCompactProtocol(transport)
- if type.capitalize() == 'Byte':
- protocol.state = VALUE_READ
- return protocol.readByte()
-
- elif type.capitalize() == 'I16':
- protocol.state = CONTAINER_READ
- return protocol.readI16()
-
- elif type.capitalize() == 'I32':
- protocol.state = CONTAINER_READ
- return protocol.readI32()
-
- elif type.capitalize() == 'I64':
- protocol.state = CONTAINER_READ
- return protocol.readI64()
-
- elif type.capitalize() == 'String':
- protocol.state = VALUE_READ
- return protocol.readString()
-
- elif type.capitalize() == 'Double':
- protocol.state = VALUE_READ
- return protocol.readDouble()
-
- elif type.capitalize() == 'Binary':
- protocol.state = FIELD_READ
- return protocol.readBinary()
-
- elif type.capitalize() == 'Bool':
- protocol.state = CONTAINER_READ
- return protocol.readBool()
-
-
-def testField(type, data):
- TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12}
- buf = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TCompactProtocol.TCompactProtocol(transport)
- protocol.writeStructBegin('struct')
- protocol.writeFieldBegin("field", TType[type.capitalize()], 10)
- if type.capitalize() == 'Byte':
- protocol.writeByte(data)
-
- elif type.capitalize() == 'I16':
- protocol.writeI16(data)
-
- elif type.capitalize() == 'I32':
- protocol.writeI32(data)
-
- elif type.capitalize() == 'I64':
- protocol.writeI64(data)
-
- elif type.capitalize() == 'String':
- protocol.writeString(data)
-
- elif type.capitalize() == 'Double':
- protocol.writeDouble(data)
-
- elif type.capitalize() == 'Binary':
- protocol.writeBinary(data)
-
- elif type.capitalize() == 'Bool':
- protocol.writeBool(data)
-
- protocol.writeFieldEnd()
- protocol.writeStructEnd()
-
- transport.flush()
- data_r = buf.getvalue()
-
- buf = TTransport.TMemoryBuffer(data_r)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TCompactProtocol.TCompactProtocol(transport)
- protocol.readStructBegin()
- protocol.readFieldBegin()
- if type.capitalize() == 'Byte':
- return protocol.readByte()
-
- elif type.capitalize() == 'I16':
- return protocol.readI16()
-
- elif type.capitalize() == 'I32':
- return protocol.readI32()
-
- elif type.capitalize() == 'I64':
- return protocol.readI32()
-
- elif type.capitalize() == 'String':
- return protocol.readString()
-
- elif type.capitalize() == 'Double':
- return protocol.readDouble()
-
- elif type.capitalize() == 'Binary':
- return protocol.readBinary()
-
- elif type.capitalize() == 'Bool':
- return protocol.readBool()
-
- protocol.readFieldEnd()
- protocol.readStructEnd()
-
-
-def testMessage(data):
- message = {}
- message['name'] = data[0]
- message['type'] = data[1]
- message['seqid'] = data[2]
-
- buf = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TCompactProtocol.TCompactProtocol(transport)
- protocol.writeMessageBegin(message['name'], message['type'], message['seqid'])
- protocol.writeMessageEnd()
-
- transport.flush()
- data_r = buf.getvalue()
-
- buf = TTransport.TMemoryBuffer(data_r)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TCompactProtocol.TCompactProtocol(transport)
- result = protocol.readMessageBegin()
- protocol.readMessageEnd()
- return result
-
-
-class TestTCompactProtocol(unittest.TestCase):
-
- def __init__(self, *args, **kwargs):
- unittest.TestCase.__init__(self, *args, **kwargs)
-
- def test_TCompactProtocol_write_read(self):
- try:
- testNaked('Byte', 123)
- for i in range(0, 128):
- self.assertEqual(i, testField('Byte', i))
- self.assertEqual(-i, testField('Byte', -i))
-
- self.assertEqual(0, testNaked("I16", 0))
- self.assertEqual(1, testNaked("I16", 1))
- self.assertEqual(15000, testNaked("I16", 15000))
- self.assertEqual(0x7fff, testNaked('I16', 0x7fff))
- self.assertEqual(-1, testNaked('I16', -1))
- self.assertEqual(-15000, testNaked('I16', -15000))
- self.assertEqual(-0x7fff, testNaked('I16', -0x7fff))
- self.assertEqual(32767, testNaked('I16', 32767))
-
- self.assertEqual(0, testField('I16', 0))
- self.assertEqual(1, testField('I16', 1))
- self.assertEqual(7, testField('I16', 7))
- self.assertEqual(150, testField('I16', 150))
- self.assertEqual(15000, testField('I16', 15000))
- self.assertEqual(0x7fff, testField('I16', 0x7fff))
- self.assertEqual(-1, testField('I16', -1))
- self.assertEqual(-7, testField('I16', -7))
- self.assertEqual(-150, testField('I16', -150))
- self.assertEqual(-15000, testField('I16', -15000))
- self.assertEqual(-0xfff, testField('I16', -0xfff))
-
- self.assertEqual(0, testNaked('I32', 0))
- self.assertEqual(1, testNaked('I32', 1))
- self.assertEqual(15000, testNaked('I32', 15000))
- self.assertEqual(0xfff, testNaked('I32', 0xfff))
- self.assertEqual(-1, testNaked('I32', -1))
- self.assertEqual(-15000, testNaked('I32', -15000))
- self.assertEqual(-0xfff, testNaked('I32', -0xfff))
- self.assertEqual(2147483647, testNaked('I32', 2147483647))
- self.assertEqual(-2147483647, testNaked('I32', -2147483647))
-
- self.assertEqual(0, testField('I32', 0))
- self.assertEqual(1, testField('I32', 1))
- self.assertEqual(7, testField('I32', 7))
- self.assertEqual(150, testField('I32', 150))
- self.assertEqual(15000, testField('I32', 15000))
- self.assertEqual(31337, testField('I32', 31337))
- self.assertEqual(0xffff, testField('I32', 0xffff))
- self.assertEqual(0xffffff, testField('I32', 0xffffff))
- self.assertEqual(-1, testField('I32', -1))
- self.assertEqual(-7, testField('I32', -7))
- self.assertEqual(-150, testField('I32', -150))
- self.assertEqual(-15000, testField('I32', -15000))
- self.assertEqual(-0xffff, testField('I32', -0xffff))
- self.assertEqual(-0xffffff, testField('I32', -0xffffff))
-
- self.assertEqual(9223372036854775807, testNaked("I64", 9223372036854775807))
- self.assertEqual(-9223372036854775807, testNaked('I64', -9223372036854775807))
- self.assertEqual(-0, testNaked('I64', 0))
- self.assertEqual(True, testNaked('Bool', True))
- self.assertEqual(3.14159261, testNaked('Double', 3.14159261))
- self.assertEqual("hello thrift", testNaked('String', "hello thrift"))
- self.assertEqual(True, testField('Bool', True))
- self.assertEqual(3.14159261, testField('Double', 3.14159261))
- self.assertEqual("hello thrift", testField('String', "hello thrift"))
- TMessage = {"T_CALL": 1, "T_REPLY": 2, "T_EXCEPTION": 3, "T_ONEWAY": 4}
- test_data = [("short message name", TMessage["T_CALL"], 0),
- ("1", TMessage["T_REPLY"], 12345),
- ("loooooooooooooooooooong", TMessage["T_EXCEPTION"], 1 << 16),
- ("one way push", TMessage["T_ONEWAY"], 12),
- ("JANKY", TMessage["T_CALL"], 0)]
- for dt in test_data:
- result = testMessage(dt)
- self.assertEqual(result[0], dt[0])
- self.assertEqual(result[1], dt[1])
- self.assertEqual(result[2], dt[2])
- except Exception as e:
- print("Assertion fail")
- raise e
-
-
-if __name__ == "__main__":
- unittest.main()
diff --git a/shell/ext-py/thrift-0.14.2/test/thrift_TNonblockingServer.py b/shell/ext-py/thrift-0.14.2/test/thrift_TNonblockingServer.py
deleted file mode 100644
index 7220879ac..000000000
--- a/shell/ext-py/thrift-0.14.2/test/thrift_TNonblockingServer.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import os
-import sys
-import threading
-import unittest
-import time
-
-gen_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "gen-py")
-sys.path.append(gen_path)
-import _import_local_thrift # noqa
-from TestServer import TestServer
-from thrift.transport import TSocket, TTransport
-from thrift.protocol import TBinaryProtocol
-from thrift.server import TNonblockingServer
-
-
-class Handler:
-
- def add_and_get_msg(self, msg):
- return msg
-
-
-class Server:
-
- def __init__(self):
- handler = Handler()
- processor = TestServer.Processor(handler)
- transport = TSocket.TServerSocket("127.0.0.1", 30030)
- self.server = TNonblockingServer.TNonblockingServer(processor, transport)
-
- def start_server(self):
- print("-------start server ------\n")
- self.server.serve()
- print("------stop server -----\n")
-
- def close_server(self):
- self.server.stop()
- self.server.close()
-
-
-class Client:
-
- def start_client(self):
- transport = TSocket.TSocket("127.0.0.1", 30030)
- trans = TTransport.TFramedTransport(transport)
- protocol = TBinaryProtocol.TBinaryProtocol(trans)
- client = TestServer.Client(protocol)
- trans.open()
- self.msg = client.add_and_get_msg("hello thrift")
-
- def get_message(self):
- try:
- msg = self.msg
- return msg
- except AttributeError as e:
- raise e
- print("self.msg not exit\n")
-
-
-class TestNonblockingServer(unittest.TestCase):
-
- def test_normalconnection(self):
- serve = Server()
- client = Client()
-
- serve_thread = threading.Thread(target=serve.start_server)
- client_thread = threading.Thread(target=client.start_client)
- serve_thread.start()
- time.sleep(10)
- client_thread.start()
- client_thread.join(0.5)
- try:
- msg = client.get_message()
- self.assertEqual("hello thrift", msg)
- except AssertionError as e:
- raise e
- print("assert failure")
- finally:
- serve.close_server()
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/shell/ext-py/thrift-0.14.2/test/thrift_TZlibTransport.py b/shell/ext-py/thrift-0.14.2/test/thrift_TZlibTransport.py
deleted file mode 100644
index ded34b03d..000000000
--- a/shell/ext-py/thrift-0.14.2/test/thrift_TZlibTransport.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import unittest
-import random
-import string
-
-import _import_local_thrift # noqa
-from thrift.transport import TTransport
-from thrift.transport import TZlibTransport
-
-
-def generate_random_buff():
- data = []
- buf_len = 1024 * 32
- index = 0
-
- while index < buf_len:
- run_len = random.randint(1, 64)
- if index + run_len > buf_len:
- run_len = buf_len - index
- for i in range(run_len):
- data.extend(random.sample(string.printable, 1))
- index += 1
-
- new_data = ''.join(data)
- return new_data
-
-
-class TestTZlibTransport(unittest.TestCase):
-
- def test_write_then_read(self):
- buff = TTransport.TMemoryBuffer()
- trans = TTransport.TBufferedTransportFactory().getTransport(buff)
- zlib_trans = TZlibTransport.TZlibTransport(trans)
- data_w = generate_random_buff()
- zlib_trans.write(data_w.encode('utf-8'))
- zlib_trans.flush()
-
- value = buff.getvalue()
- zlib_trans.close()
-
- buff = TTransport.TMemoryBuffer(value)
- trans = TTransport.TBufferedTransportFactory().getTransport(buff)
- zlib_trans = TZlibTransport.TZlibTransport(trans)
- data_r = zlib_trans.read(len(data_w))
- zlib_trans.close()
-
- try:
- self.assertEqual(data_w, data_r.decode('utf-8'))
- self.assertEqual(len(data_w), len(data_r.decode('utf-8')))
- except AssertionError:
- raise
-
- def test_after_flushd_write_then_read(self):
- buff = TTransport.TMemoryBuffer()
- trans = TTransport.TBufferedTransportFactory().getTransport(buff)
- zlib_trans = TZlibTransport.TZlibTransport(trans)
- data_w_1 = "hello thrift !@#" * 50
- zlib_trans.write(data_w_1.encode('utf-8'))
- zlib_trans.flush()
- data_w_2 = "{'name': 'thrift', 1: ['abcd' , 233, ('a','c')]}" * 20
- zlib_trans.write(data_w_2.encode('utf-8'))
- zlib_trans.flush()
-
- value = buff.getvalue()
- zlib_trans.close()
-
- buff = TTransport.TMemoryBuffer(value)
- trans = TTransport.TBufferedTransportFactory().getTransport(buff)
- zlib_trans = TZlibTransport.TZlibTransport(trans)
- data_r = zlib_trans.read(len(data_w_1) + len(data_w_2))
- zlib_trans.close()
-
- try:
- self.assertEqual(data_w_1 + data_w_2, data_r.decode('utf-8'))
- self.assertEqual(len(data_w_1) + len(data_w_2), len(data_r.decode('utf-8')))
- except AssertionError:
- raise
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/shell/ext-py/thrift-0.14.2/test/thrift_json.py b/shell/ext-py/thrift-0.14.2/test/thrift_json.py
deleted file mode 100644
index 125ea59f6..000000000
--- a/shell/ext-py/thrift-0.14.2/test/thrift_json.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-import unittest
-
-import _import_local_thrift # noqa
-from thrift.protocol.TJSONProtocol import TJSONProtocol
-from thrift.transport import TTransport
-
-#
-# In order to run the test under Windows. We need to create symbolic link
-# name 'thrift' to '../src' folder by using:
-#
-# mklink /D thrift ..\src
-#
-
-
-class TestJSONString(unittest.TestCase):
-
- def test_escaped_unicode_string(self):
- unicode_json = b'"hello \\u0e01\\u0e02\\u0e03\\ud835\\udcab\\udb40\\udc70 unicode"'
- unicode_text = u'hello \u0e01\u0e02\u0e03\U0001D4AB\U000E0070 unicode'
-
- buf = TTransport.TMemoryBuffer(unicode_json)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
- protocol = TJSONProtocol(transport)
-
- if sys.version_info[0] == 2:
- unicode_text = unicode_text.encode('utf8')
- self.assertEqual(protocol.readString(), unicode_text)
-
- def test_TJSONProtocol_write(self):
- write_data = '{"software":"thrift","1":[23,1.2010000000000001,32767,2147483647,9223372036854775807],"base64":"aGVsbG8gdGhyaWZ0","bool":0}'
-
- buff = TTransport.TMemoryBuffer()
- transport = TTransport.TBufferedTransportFactory().getTransport(buff)
- protocol = TJSONProtocol(transport)
- protocol.writeJSONObjectStart()
- protocol.writeJSONString("software")
- protocol.writeJSONString("thrift")
- protocol.writeJSONString("1")
- protocol.writeJSONArrayStart()
- protocol.writeJSONNumber(23)
- protocol.writeDouble(1.201)
- protocol.writeI16(32767)
- protocol.writeI32(2147483647)
- protocol.writeI64(9223372036854775807)
- protocol.writeJSONArrayEnd()
- protocol.writeJSONString("base64")
- protocol.writeJSONBase64("hello thrift".encode('utf-8'))
- protocol.writeJSONString("bool")
- protocol.writeBool(0)
- protocol.writeJSONObjectEnd()
-
- transport.flush()
- value = buff.getvalue()
-
- self.assertEqual(write_data, value.decode('utf-8'))
-
- def test_TJSONProtol_read(self):
- expected = "{'software':'thrift','1':[23,1.2010000000000001,32767,2147483647,9223372036854775807],'base64':'hello thrift','bool':False}"
- read_data = '{"software":"thrift","1":[23,1.2010000000000001,32767,2147483647,9223372036854775807],"base64":"aGVsbG8gdGhyaWZ0","bool":0}'
-
- buff = TTransport.TMemoryBuffer(read_data.encode('utf-8'))
- transport = TTransport.TBufferedTransportFactory().getTransport(buff)
- protocol = TJSONProtocol(transport)
- protocol.readJSONObjectStart()
- u_1 = protocol.readString()
- u_2 = protocol.readString()
- u_3 = protocol.readString()
- protocol.readJSONArrayStart()
- u_4 = protocol.readNumber()
- u_5 = protocol.readDouble()
- u_6 = protocol.readI16()
- u_7 = protocol.readI32()
- u_8 = protocol.readI64()
- protocol.readJSONArrayEnd()
- u_9 = protocol.readString()
- u_10 = protocol.readJSONBase64()
- u_11 = protocol.readString()
- u_12 = protocol.readBool()
- protocol.writeJSONObjectEnd()
-
- result_read = {}
- result_read[u_1] = u_2
- result_read[u_3] = []
- result_read[u_3].append(u_4)
- result_read[u_3].append(u_5)
- result_read[u_3].append(u_6)
- result_read[u_3].append(u_7)
- result_read[u_3].append(u_8)
- result_read[u_9] = u_10.decode('utf-8')
- result_read[u_11] = u_12
-
- self.assertEqual(eval(expected), result_read)
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/shell/ext-py/thrift-0.14.2/test/thrift_transport.py b/shell/ext-py/thrift-0.14.2/test/thrift_transport.py
deleted file mode 100644
index cb1bb0ce7..000000000
--- a/shell/ext-py/thrift-0.14.2/test/thrift_transport.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import unittest
-import os
-
-import _import_local_thrift # noqa
-from thrift.transport import TTransport
-
-
-class TestTFileObjectTransport(unittest.TestCase):
-
- def test_TFileObjectTransport(self):
- test_dir = os.path.dirname(os.path.abspath(__file__))
- datatxt_path = os.path.join(test_dir, 'data.txt')
- buffer = '{"soft":"thrift","version":0.13,"1":true}'
- with open(datatxt_path, "w+") as f:
- buf = TTransport.TFileObjectTransport(f)
- buf.write(buffer)
- buf.flush()
- buf.close()
-
- with open(datatxt_path, "rb") as f:
- buf = TTransport.TFileObjectTransport(f)
- value = buf.read(len(buffer)).decode('utf-8')
- self.assertEqual(buffer, value)
- buf.close()
- os.remove(datatxt_path)
-
-
-class TestMemoryBuffer(unittest.TestCase):
-
- def test_memorybuffer_write(self):
- data = '{"1":[1,"hello"],"a":{"A":"abc"},"bool":true,"num":12345}'
-
- buffer_w = TTransport.TMemoryBuffer()
- buffer_w.write(data.encode('utf-8'))
- value = buffer_w.getvalue()
- self.assertEqual(value.decode('utf-8'), data)
- buffer_w.close()
-
- def test_memorybuffer_read(self):
- data = '{"1":[1, "hello"],"a":{"A":"abc"},"bool":true,"num":12345}'
-
- buffer_r = TTransport.TMemoryBuffer(data.encode('utf-8'))
- value_r = buffer_r.read(len(data))
- value = buffer_r.getvalue()
- self.assertEqual(value.decode('utf-8'), data)
- self.assertEqual(value_r.decode('utf-8'), data)
- buffer_r.close()
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/shell/ext-py/thrift-0.14.2/MANIFEST.in b/shell/ext-py/thrift-0.16.0/MANIFEST.in
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/MANIFEST.in
rename to shell/ext-py/thrift-0.16.0/MANIFEST.in
diff --git a/shell/ext-py/thrift-0.14.2/README.md b/shell/ext-py/thrift-0.16.0/README.md
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/README.md
rename to shell/ext-py/thrift-0.16.0/README.md
diff --git a/shell/ext-py/thrift-0.16.0/setup.cfg b/shell/ext-py/thrift-0.16.0/setup.cfg
new file mode 100644
index 000000000..5aec19fd5
--- /dev/null
+++ b/shell/ext-py/thrift-0.16.0/setup.cfg
@@ -0,0 +1,13 @@
+[install]
+optimize = 1
+
+[metadata]
+description_file = README.md
+
+[flake8]
+max-line-length = 100
+
+[egg_info]
+tag_build =
+tag_date = 0
+
diff --git a/shell/ext-py/thrift-0.14.2/setup.py b/shell/ext-py/thrift-0.16.0/setup.py
similarity index 91%
rename from shell/ext-py/thrift-0.14.2/setup.py
rename to shell/ext-py/thrift-0.16.0/setup.py
index efce17d6b..7cd4a2e90 100644
--- a/shell/ext-py/thrift-0.14.2/setup.py
+++ b/shell/ext-py/thrift-0.16.0/setup.py
@@ -62,6 +62,20 @@ class ve_build_ext(build_ext):
raise BuildFailed()
+def read_file(path):
+ """
+ Return the contents of a file
+
+ Arguments:
+ - path: path to the file
+
+ Returns:
+ - contents of the file
+ """
+ with open(path, "r") as desc_file:
+ return desc_file.read().rstrip()
+
+
def run_setup(with_binary):
if with_binary:
extensions = dict(
@@ -91,8 +105,10 @@ def run_setup(with_binary):
twisted_deps = ['twisted']
setup(name='thrift',
- version='0.14.2',
+ version='0.16.0',
description='Python bindings for the Apache Thrift RPC system',
+ long_description=read_file("README.md"),
+ long_description_content_type="text/markdown",
author='Apache Thrift Developers',
author_email='dev@thrift.apache.org',
url='http://thrift.apache.org',
diff --git a/shell/ext-py/thrift-0.14.2/src/TMultiplexedProcessor.py b/shell/ext-py/thrift-0.16.0/src/TMultiplexedProcessor.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/TMultiplexedProcessor.py
rename to shell/ext-py/thrift-0.16.0/src/TMultiplexedProcessor.py
diff --git a/shell/ext-py/thrift-0.14.2/src/TRecursive.py b/shell/ext-py/thrift-0.16.0/src/TRecursive.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/TRecursive.py
rename to shell/ext-py/thrift-0.16.0/src/TRecursive.py
diff --git a/shell/ext-py/thrift-0.14.2/src/TSCons.py b/shell/ext-py/thrift-0.16.0/src/TSCons.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/TSCons.py
rename to shell/ext-py/thrift-0.16.0/src/TSCons.py
diff --git a/shell/ext-py/thrift-0.14.2/src/TSerialization.py b/shell/ext-py/thrift-0.16.0/src/TSerialization.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/TSerialization.py
rename to shell/ext-py/thrift-0.16.0/src/TSerialization.py
diff --git a/shell/ext-py/thrift-0.14.2/src/TTornado.py b/shell/ext-py/thrift-0.16.0/src/TTornado.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/TTornado.py
rename to shell/ext-py/thrift-0.16.0/src/TTornado.py
diff --git a/shell/ext-py/thrift-0.14.2/src/Thrift.py b/shell/ext-py/thrift-0.16.0/src/Thrift.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/Thrift.py
rename to shell/ext-py/thrift-0.16.0/src/Thrift.py
diff --git a/shell/ext-py/thrift-0.14.2/src/__init__.py b/shell/ext-py/thrift-0.16.0/src/__init__.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/__init__.py
rename to shell/ext-py/thrift-0.16.0/src/__init__.py
diff --git a/shell/ext-py/thrift-0.14.2/src/compat.py b/shell/ext-py/thrift-0.16.0/src/compat.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/compat.py
rename to shell/ext-py/thrift-0.16.0/src/compat.py
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/binary.cpp b/shell/ext-py/thrift-0.16.0/src/ext/binary.cpp
similarity index 97%
rename from shell/ext-py/thrift-0.14.2/src/ext/binary.cpp
rename to shell/ext-py/thrift-0.16.0/src/ext/binary.cpp
index 85d8d922e..423fa8fee 100644
--- a/shell/ext-py/thrift-0.14.2/src/ext/binary.cpp
+++ b/shell/ext-py/thrift-0.16.0/src/ext/binary.cpp
@@ -17,6 +17,7 @@
* under the License.
*/
+#define PY_SSIZE_T_CLEAN
#include "ext/binary.h"
namespace apache {
namespace thrift {
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/binary.h b/shell/ext-py/thrift-0.16.0/src/ext/binary.h
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/binary.h
rename to shell/ext-py/thrift-0.16.0/src/ext/binary.h
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/compact.cpp b/shell/ext-py/thrift-0.16.0/src/ext/compact.cpp
similarity index 99%
rename from shell/ext-py/thrift-0.14.2/src/ext/compact.cpp
rename to shell/ext-py/thrift-0.16.0/src/ext/compact.cpp
index 15a99a077..ae89f2a65 100644
--- a/shell/ext-py/thrift-0.14.2/src/ext/compact.cpp
+++ b/shell/ext-py/thrift-0.16.0/src/ext/compact.cpp
@@ -17,6 +17,7 @@
* under the License.
*/
+#define PY_SSIZE_T_CLEAN
#include "ext/compact.h"
namespace apache {
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/compact.h b/shell/ext-py/thrift-0.16.0/src/ext/compact.h
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/compact.h
rename to shell/ext-py/thrift-0.16.0/src/ext/compact.h
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/endian.h b/shell/ext-py/thrift-0.16.0/src/ext/endian.h
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/endian.h
rename to shell/ext-py/thrift-0.16.0/src/ext/endian.h
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/module.cpp b/shell/ext-py/thrift-0.16.0/src/ext/module.cpp
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/module.cpp
rename to shell/ext-py/thrift-0.16.0/src/ext/module.cpp
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/protocol.h b/shell/ext-py/thrift-0.16.0/src/ext/protocol.h
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/protocol.h
rename to shell/ext-py/thrift-0.16.0/src/ext/protocol.h
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/protocol.tcc b/shell/ext-py/thrift-0.16.0/src/ext/protocol.tcc
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/protocol.tcc
rename to shell/ext-py/thrift-0.16.0/src/ext/protocol.tcc
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/types.cpp b/shell/ext-py/thrift-0.16.0/src/ext/types.cpp
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/types.cpp
rename to shell/ext-py/thrift-0.16.0/src/ext/types.cpp
diff --git a/shell/ext-py/thrift-0.14.2/src/ext/types.h b/shell/ext-py/thrift-0.16.0/src/ext/types.h
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/ext/types.h
rename to shell/ext-py/thrift-0.16.0/src/ext/types.h
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TBase.py b/shell/ext-py/thrift-0.16.0/src/protocol/TBase.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TBase.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TBase.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TBinaryProtocol.py b/shell/ext-py/thrift-0.16.0/src/protocol/TBinaryProtocol.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TBinaryProtocol.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TBinaryProtocol.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TCompactProtocol.py b/shell/ext-py/thrift-0.16.0/src/protocol/TCompactProtocol.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TCompactProtocol.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TCompactProtocol.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/THeaderProtocol.py b/shell/ext-py/thrift-0.16.0/src/protocol/THeaderProtocol.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/THeaderProtocol.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/THeaderProtocol.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TJSONProtocol.py b/shell/ext-py/thrift-0.16.0/src/protocol/TJSONProtocol.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TJSONProtocol.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TJSONProtocol.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TMultiplexedProtocol.py b/shell/ext-py/thrift-0.16.0/src/protocol/TMultiplexedProtocol.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TMultiplexedProtocol.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TMultiplexedProtocol.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TProtocol.py b/shell/ext-py/thrift-0.16.0/src/protocol/TProtocol.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TProtocol.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TProtocol.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/TProtocolDecorator.py b/shell/ext-py/thrift-0.16.0/src/protocol/TProtocolDecorator.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/TProtocolDecorator.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/TProtocolDecorator.py
diff --git a/shell/ext-py/thrift-0.14.2/src/protocol/__init__.py b/shell/ext-py/thrift-0.16.0/src/protocol/__init__.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/protocol/__init__.py
rename to shell/ext-py/thrift-0.16.0/src/protocol/__init__.py
diff --git a/shell/ext-py/thrift-0.14.2/src/server/THttpServer.py b/shell/ext-py/thrift-0.16.0/src/server/THttpServer.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/server/THttpServer.py
rename to shell/ext-py/thrift-0.16.0/src/server/THttpServer.py
diff --git a/shell/ext-py/thrift-0.14.2/src/server/TNonblockingServer.py b/shell/ext-py/thrift-0.16.0/src/server/TNonblockingServer.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/server/TNonblockingServer.py
rename to shell/ext-py/thrift-0.16.0/src/server/TNonblockingServer.py
diff --git a/shell/ext-py/thrift-0.14.2/src/server/TProcessPoolServer.py b/shell/ext-py/thrift-0.16.0/src/server/TProcessPoolServer.py
similarity index 97%
rename from shell/ext-py/thrift-0.14.2/src/server/TProcessPoolServer.py
rename to shell/ext-py/thrift-0.16.0/src/server/TProcessPoolServer.py
index fe6dc8162..c9cfa1104 100644
--- a/shell/ext-py/thrift-0.14.2/src/server/TProcessPoolServer.py
+++ b/shell/ext-py/thrift-0.16.0/src/server/TProcessPoolServer.py
@@ -42,6 +42,11 @@ class TProcessPoolServer(TServer):
self.stopCondition = Condition()
self.postForkCallback = None
+ def __getstate__(self):
+ state = self.__dict__.copy()
+ state['workers'] = None
+ return state
+
def setPostForkCallback(self, callback):
if not callable(callback):
raise TypeError("This is not a callback!")
diff --git a/shell/ext-py/thrift-0.14.2/src/server/TServer.py b/shell/ext-py/thrift-0.16.0/src/server/TServer.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/server/TServer.py
rename to shell/ext-py/thrift-0.16.0/src/server/TServer.py
diff --git a/shell/ext-py/thrift-0.14.2/src/server/__init__.py b/shell/ext-py/thrift-0.16.0/src/server/__init__.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/server/__init__.py
rename to shell/ext-py/thrift-0.16.0/src/server/__init__.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/THeaderTransport.py b/shell/ext-py/thrift-0.16.0/src/transport/THeaderTransport.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/THeaderTransport.py
rename to shell/ext-py/thrift-0.16.0/src/transport/THeaderTransport.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/THttpClient.py b/shell/ext-py/thrift-0.16.0/src/transport/THttpClient.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/THttpClient.py
rename to shell/ext-py/thrift-0.16.0/src/transport/THttpClient.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/TSSLSocket.py b/shell/ext-py/thrift-0.16.0/src/transport/TSSLSocket.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/TSSLSocket.py
rename to shell/ext-py/thrift-0.16.0/src/transport/TSSLSocket.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/TSocket.py b/shell/ext-py/thrift-0.16.0/src/transport/TSocket.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/TSocket.py
rename to shell/ext-py/thrift-0.16.0/src/transport/TSocket.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/TTransport.py b/shell/ext-py/thrift-0.16.0/src/transport/TTransport.py
similarity index 99%
rename from shell/ext-py/thrift-0.14.2/src/transport/TTransport.py
rename to shell/ext-py/thrift-0.16.0/src/transport/TTransport.py
index 9dbe95df4..ff20d7ec9 100644
--- a/shell/ext-py/thrift-0.14.2/src/transport/TTransport.py
+++ b/shell/ext-py/thrift-0.16.0/src/transport/TTransport.py
@@ -398,6 +398,9 @@ class TSaslClientTransport(TTransportBase, CReadableTransport):
"Bad SASL negotiation status: %d (%s)"
% (status, challenge))
+ def isOpen(self):
+ return self.transport.isOpen()
+
def send_sasl_msg(self, status, body):
header = pack(">BI", status, len(body))
self.transport.write(header + body)
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/TTwisted.py b/shell/ext-py/thrift-0.16.0/src/transport/TTwisted.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/TTwisted.py
rename to shell/ext-py/thrift-0.16.0/src/transport/TTwisted.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/TZlibTransport.py b/shell/ext-py/thrift-0.16.0/src/transport/TZlibTransport.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/TZlibTransport.py
rename to shell/ext-py/thrift-0.16.0/src/transport/TZlibTransport.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/__init__.py b/shell/ext-py/thrift-0.16.0/src/transport/__init__.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/__init__.py
rename to shell/ext-py/thrift-0.16.0/src/transport/__init__.py
diff --git a/shell/ext-py/thrift-0.14.2/src/transport/sslcompat.py b/shell/ext-py/thrift-0.16.0/src/transport/sslcompat.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/src/transport/sslcompat.py
rename to shell/ext-py/thrift-0.16.0/src/transport/sslcompat.py
diff --git a/shell/ext-py/thrift-0.14.2/test/test_socket.py b/shell/ext-py/thrift-0.16.0/test/test_socket.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/test/test_socket.py
rename to shell/ext-py/thrift-0.16.0/test/test_socket.py
diff --git a/shell/ext-py/thrift-0.14.2/test/test_sslsocket.py b/shell/ext-py/thrift-0.16.0/test/test_sslsocket.py
similarity index 100%
rename from shell/ext-py/thrift-0.14.2/test/test_sslsocket.py
rename to shell/ext-py/thrift-0.16.0/test/test_sslsocket.py
diff --git a/shell/packaging/requirements.txt b/shell/packaging/requirements.txt
index 1b2e2ce22..26da634b9 100644
--- a/shell/packaging/requirements.txt
+++ b/shell/packaging/requirements.txt
@@ -6,5 +6,5 @@ sasl==0.3.1
setuptools>=36.8.0
six==1.14.0
sqlparse==0.3.1
-thrift==0.14.2
+thrift==0.16.0
thrift_sasl==0.4.3