parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [parquet-cpp] branch master updated: PARQUET-1179: Upgrade to Thrift 0.11, use std::shared_ptr instead of boost::shared_ptr
Date Sun, 28 Jan 2018 14:30:27 GMT
This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new c064f82  PARQUET-1179: Upgrade to Thrift 0.11, use std::shared_ptr instead of boost::shared_ptr
c064f82 is described below

commit c064f827e96b37d29ba7a7b87657a18a94896854
Author: Uwe L. Korn <uwelk@xhochy.com>
AuthorDate: Sun Jan 28 15:30:20 2018 +0100

    PARQUET-1179: Upgrade to Thrift 0.11, use std::shared_ptr instead of boost::shared_ptr
    
    Author: Uwe L. Korn <uwelk@xhochy.com>
    Author: Wes McKinney <wes.mckinney@twosigma.com>
    Author: Uwe L. Korn <uwe@apache.org>
    
    Closes #433 from wesm/PARQUET-1179 and squashes the following commits:
    
    e005a01 [Uwe L. Korn] Install thrift-cpp=0.11.0 on AppVeyor
    9f82afe [Uwe L. Korn] Install newer bison
    3b798c4 [Wes McKinney] Upgrade to Thrift 0.11, use std::shared_ptr instead of boost::shared_ptr
---
 ci/before_script_travis.sh              |  2 ++
 ci/msvc-build.bat                       |  2 +-
 cmake_modules/ThirdpartyToolchain.cmake |  2 +-
 src/parquet/thrift.h                    | 12 +++++-------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ci/before_script_travis.sh b/ci/before_script_travis.sh
index 4251ee5..95a2fd8 100755
--- a/ci/before_script_travis.sh
+++ b/ci/before_script_travis.sh
@@ -16,8 +16,10 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then
   brew update > /dev/null
   brew install boost
   brew install openssl
+  brew install bison
   export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
   export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$LD_LIBRARY_PATH
+  export PATH="/usr/local/opt/bison/bin:$PATH"
 else
   # Use a C++11 compiler on Linux
   export CC="gcc-4.9"
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
index 56c7927..6cca539 100644
--- a/ci/msvc-build.bat
+++ b/ci/msvc-build.bat
@@ -33,7 +33,7 @@ if NOT "%CONFIGURATION%" == "Debug" (
 )
 
 if "%CONFIGURATION%" == "Toolchain" (
-  conda install -y boost-cpp=1.63 thrift-cpp=0.10.0 ^
+  conda install -y boost-cpp=1.63 thrift-cpp=0.11.0 ^
       brotli=0.6.0 zlib=1.2.11 snappy=1.1.6 lz4-c=1.7.5 zstd=1.2.0 ^
       -c conda-forge
 
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 052bbfa..53a1dc7 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -17,7 +17,7 @@
 
 set(GTEST_VERSION "1.8.0")
 set(GBENCHMARK_VERSION "1.1.0")
-set(THRIFT_VERSION "0.10.0")
+set(THRIFT_VERSION "0.11.0")
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_BUILD_TYPE)
 
diff --git a/src/parquet/thrift.h b/src/parquet/thrift.h
index 7a23e41..d2915a9 100644
--- a/src/parquet/thrift.h
+++ b/src/parquet/thrift.h
@@ -19,9 +19,7 @@
 #define PARQUET_THRIFT_UTIL_H
 
 #include <cstdint>
-
-// Needed for thrift
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 // TCompactProtocol requires some #defines to work right.
 #define SIGNED_RIGHT_SHIFT_IS 1
@@ -96,12 +94,12 @@ static inline format::CompressionCodec::type ToThrift(Compression::type
type) {
 template <class T>
 inline void DeserializeThriftMsg(const uint8_t* buf, uint32_t* len, T* deserialized_msg)
{
   // Deserialize msg bytes into c++ thrift msg using memory transport.
-  boost::shared_ptr<apache::thrift::transport::TMemoryBuffer> tmem_transport(
+  std::shared_ptr<apache::thrift::transport::TMemoryBuffer> tmem_transport(
       new apache::thrift::transport::TMemoryBuffer(const_cast<uint8_t*>(buf), *len));
   apache::thrift::protocol::TCompactProtocolFactoryT<
       apache::thrift::transport::TMemoryBuffer>
       tproto_factory;
-  boost::shared_ptr<apache::thrift::protocol::TProtocol> tproto =
+  std::shared_ptr<apache::thrift::protocol::TProtocol> tproto =
       tproto_factory.getProtocol(tmem_transport);
   try {
     deserialized_msg->read(tproto.get());
@@ -119,12 +117,12 @@ inline void DeserializeThriftMsg(const uint8_t* buf, uint32_t* len,
T* deseriali
 // the expected size of the serialized object
 template <class T>
 inline int64_t SerializeThriftMsg(T* obj, uint32_t len, OutputStream* out) {
-  boost::shared_ptr<apache::thrift::transport::TMemoryBuffer> mem_buffer(
+  std::shared_ptr<apache::thrift::transport::TMemoryBuffer> mem_buffer(
       new apache::thrift::transport::TMemoryBuffer(len));
   apache::thrift::protocol::TCompactProtocolFactoryT<
       apache::thrift::transport::TMemoryBuffer>
       tproto_factory;
-  boost::shared_ptr<apache::thrift::protocol::TProtocol> tproto =
+  std::shared_ptr<apache::thrift::protocol::TProtocol> tproto =
       tproto_factory.getProtocol(mem_buffer);
   try {
     mem_buffer->resetBuffer();

-- 
To stop receiving notification emails like this one, please contact
uwe@apache.org.

Mime
View raw message