From f3a217b827f190181e4643c755ff378d08a09e48 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Thu, 24 Jan 2019 17:34:56 +0100 Subject: [PATCH 1/2] [PARQUET-1507] Bump Apache Thrift to 0.12.0 --- README.md | 12 ++++++------ dev/travis-before_install.sh | 8 +++++--- parquet-format-structures/pom.xml | 4 ++-- parquet-protobuf/pom.xml | 2 +- pom.xml | 3 +-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 07e1908824..09e5def90b 100644 --- a/README.md +++ b/README.md @@ -35,19 +35,19 @@ Parquet-MR uses Maven to build and depends on the thrift compiler (protoc is now To build and install the thrift compiler, run: ``` -wget -nv http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz -tar xzf thrift-0.9.3.tar.gz -cd thrift-0.9.3 +wget -nv http://archive.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz +tar xzf thrift-0.12.0.tar.gz +cd thrift-0.12.0 chmod +x ./configure ./configure --disable-gen-erl --disable-gen-hs --without-ruby --without-haskell --without-erlang --without-php --without-nodejs sudo make install ``` -If you're on OSX and use homebrew, you can instead install Thrift 0.9.x with `brew` and ensure that it comes first in your `PATH`. +If you're on OSX and use homebrew, you can instead install Thrift 0.12.0 with `brew` and ensure that it comes first in your `PATH`. ``` -brew install thrift@0.9 -export PATH="/usr/local/opt/thrift@0.9/bin:$PATH" +brew install thrift@0.12.0 +export PATH="/usr/local/opt/thrift@0.12.0/bin:$PATH" ``` ### Build Parquet with Maven diff --git a/dev/travis-before_install.sh b/dev/travis-before_install.sh index 5161f223f4..67fee74fd0 100644 --- a/dev/travis-before_install.sh +++ b/dev/travis-before_install.sh @@ -19,6 +19,8 @@ # This script gets invoked by .travis.yml in the before_install step ################################################################################ +export THIFT_VERSION=0.12.0 + set -e date sudo apt-get update -qq @@ -27,9 +29,9 @@ sudo apt-get install -qq build-essential pv autoconf automake libtool curl make libevent-dev automake libtool flex bison pkg-config g++ libssl-dev xmlstarlet date pwd -wget -nv http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz -tar zxf thrift-0.9.3.tar.gz -cd thrift-0.9.3 +wget -nv http://archive.apache.org/dist/thrift/${THIFT_VERSION}/thrift-${THIFT_VERSION}.tar.gz +tar zxf thrift-${THIFT_VERSION}.tar.gz +cd thrift-${THIFT_VERSION} chmod +x ./configure ./configure --disable-gen-erl --disable-gen-hs --without-ruby --without-haskell --without-erlang --without-php --without-nodejs sudo make install diff --git a/parquet-format-structures/pom.xml b/parquet-format-structures/pom.xml index d091a361b1..c5f9bf2014 100644 --- a/parquet-format-structures/pom.xml +++ b/parquet-format-structures/pom.xml @@ -70,7 +70,7 @@ org.apache.thrift thrift-maven-plugin - ${thrift-maven-plugin.version} + ${thrift-maven-plugin.version} ${parquet.thrift.path} ${format.thrift.executable} @@ -156,7 +156,7 @@ org.apache.thrift libthrift - ${format.thrift.version} + ${thrift.version} diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml index 9e5d8fee87..843e05e030 100644 --- a/parquet-protobuf/pom.xml +++ b/parquet-protobuf/pom.xml @@ -90,7 +90,7 @@ org.apache.thrift libthrift - ${format.thrift.version} + ${thrift.version} diff --git a/pom.xml b/pom.xml index d1ce7dd4e0..601fb05ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -92,8 +92,7 @@ 0.16.0 h2 0.10.0 - 0.9.3 - 0.9.3 + 0.12.0 7.0.13 0.9.33 1.7.22 From 8755b9f05930d33d34335ba892d9fd57f15ce22a Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 29 Jan 2019 13:46:47 +0100 Subject: [PATCH 2/2] [PARQUET-1507] Bump Apache Thrift to 0.12.0 --- parquet-format-structures/pom.xml | 4 ++-- parquet-protobuf/pom.xml | 2 +- pom.xml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/parquet-format-structures/pom.xml b/parquet-format-structures/pom.xml index c5f9bf2014..d091a361b1 100644 --- a/parquet-format-structures/pom.xml +++ b/parquet-format-structures/pom.xml @@ -70,7 +70,7 @@ org.apache.thrift thrift-maven-plugin - ${thrift-maven-plugin.version} + ${thrift-maven-plugin.version} ${parquet.thrift.path} ${format.thrift.executable} @@ -156,7 +156,7 @@ org.apache.thrift libthrift - ${thrift.version} + ${format.thrift.version} diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml index 843e05e030..9e5d8fee87 100644 --- a/parquet-protobuf/pom.xml +++ b/parquet-protobuf/pom.xml @@ -90,7 +90,7 @@ org.apache.thrift libthrift - ${thrift.version} + ${format.thrift.version} diff --git a/pom.xml b/pom.xml index 601fb05ae6..2ff67de1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,7 @@ h2 0.10.0 0.12.0 + 0.12.0 7.0.13 0.9.33 1.7.22