This is an automated email from the ASF dual-hosted git repository. fokko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/parquet-format.git
The following commit(s) were added to refs/heads/master by this push: new 5205dc7 PARQUET-2005: Upgrade Apache Thrift to 0.14.1 (#175) 5205dc7 is described below commit 5205dc7b7c0b910ea6af33cadbd2963c0c47c726 Author: Fokko Driesprong <fo...@apache.org> AuthorDate: Tue Feb 7 22:17:24 2023 +0100 PARQUET-2005: Upgrade Apache Thrift to 0.14.1 (#175) * PARQUET-2005: Upgrade Apache Thrift to 0.14.1 * Return the delegate instead --- .github/workflows/test.yml | 4 ++-- .gitignore | 1 + pom.xml | 2 +- src/main/java/org/apache/parquet/format/InterningProtocol.java | 5 +++++ src/main/java/org/apache/parquet/format/Util.java | 5 +++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a93eee5..0622635 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,8 +40,8 @@ jobs: sudo apt-get update -qq sudo apt-get install -qq protobuf-compiler sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev - wget -qO- https://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz | tar zxf - - cd thrift-0.13.0/ + wget -qO- https://archive.apache.org/dist/thrift/0.14.1/thrift-0.14.1.tar.gz | tar zxf - + cd thrift-0.14.1/ chmod +x ./configure ./configure --disable-libs sudo make install diff --git a/.gitignore b/.gitignore index 944e4a2..6eed724 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ dependency-reduced-pom.xml # IDE stuff .idea/ +*.iml diff --git a/pom.xml b/pom.xml index e71cd42..20671a2 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <shade.prefix>shaded.parquet</shade.prefix> <thrift.executable>thrift</thrift.executable> - <thrift.version>0.13.0</thrift.version> + <thrift.version>0.14.1</thrift.version> <thrift-maven-plugin.version>0.10.0</thrift-maven-plugin.version> </properties> diff --git a/src/main/java/org/apache/parquet/format/InterningProtocol.java b/src/main/java/org/apache/parquet/format/InterningProtocol.java index 843a02c..90a1170 100644 --- a/src/main/java/org/apache/parquet/format/InterningProtocol.java +++ b/src/main/java/org/apache/parquet/format/InterningProtocol.java @@ -224,6 +224,11 @@ public class InterningProtocol extends TProtocol { return delegate.readBinary(); } + @Override + public int getMinSerializedSize(byte b) throws TException { + return delegate.getMinSerializedSize(b); + } + public void reset() { delegate.reset(); } diff --git a/src/main/java/org/apache/parquet/format/Util.java b/src/main/java/org/apache/parquet/format/Util.java index 0532bce..0c831b6 100644 --- a/src/main/java/org/apache/parquet/format/Util.java +++ b/src/main/java/org/apache/parquet/format/Util.java @@ -47,6 +47,7 @@ import org.apache.parquet.format.event.EventBasedThriftReader; import org.apache.parquet.format.event.TypedConsumer.I32Consumer; import org.apache.parquet.format.event.TypedConsumer.I64Consumer; import org.apache.parquet.format.event.TypedConsumer.StringConsumer; +import org.apache.thrift.transport.TTransportException; /** * Utility to read/write metadata @@ -207,11 +208,11 @@ public class Util { } } - private static TProtocol protocol(OutputStream to) { + private static TProtocol protocol(OutputStream to) throws TTransportException { return protocol(new TIOStreamTransport(to)); } - private static TProtocol protocol(InputStream from) { + private static TProtocol protocol(InputStream from) throws TTransportException { return protocol(new TIOStreamTransport(from)); }