Skip to content

Commit

Permalink
DRILL-6642: Update protocol-buffers version
Browse files Browse the repository at this point in the history
1. Updated protobuf to version 3.6.1
2. Added protobuf to the root pom dependency management
3. Added classes BoundedByteString and LiteralByteString for compatibility with HBase
4. Added ProtobufPatcher to provide compatibility with MapR-DB and HBase
closes #1639
  • Loading branch information
agozhiy authored and Hanumath Maduri committed Mar 4, 2019
1 parent 8c7de78 commit 2c3e2de
Show file tree
Hide file tree
Showing 41 changed files with 60,762 additions and 40,945 deletions.
19 changes: 15 additions & 4 deletions .travis.yml
Expand Up @@ -25,15 +25,26 @@ jdk:
cache:
directories:
- "$HOME/.m2"
- "$HOME/protobuf"
before_install:
- git fetch --unshallow
# Install libraries required for protobuf generation
- |
if [ $PHASE = "build_checkstyle_protobuf" ]; then \
sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev && \
pushd .. && wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz && \
tar -xzvf protobuf-2.5.0.tar.gz && \
pushd protobuf-2.5.0 && ./configure --prefix=/usr && make && sudo make install && popd && popd; \
sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall && \
pushd .. && \
if [ -f $HOME/protobuf/protobuf_3.6.1* ]; then \
sudo dpkg -i $HOME/protobuf/protobuf_3.6.1*; \
else \
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protobuf-java-3.6.1.zip && \
unzip protobuf-java-3.6.1.zip && pushd protobuf-3.6.1 && \
./configure && sudo make && sudo checkinstall -y && \
if [ ! -d $HOME/protobuf ]; then \
mkdir -p $HOME/protobuf; \
fi && \
mv protobuf_3.6.1* $HOME/protobuf/ && popd; \
fi && \
sudo ldconfig && popd; \
fi
install:
# For tests phase runs unit tests
Expand Down
14 changes: 7 additions & 7 deletions contrib/native/client/readme.linux
Expand Up @@ -27,15 +27,15 @@ Install Prerequisites
1) CMAKE 3.0
$> yum install cmake3

2.1) Download protobuf 2.5 from :
http://rpm.pbone.net/index.php3/stat/4/idpl/23552166/dir/centos_6/com/protobuf-2.5.0-16.1.x86_64.rpm.html
http://rpm.pbone.net/index.php3/stat/4/idpl/23552167/dir/centos_6/com/protobuf-compiler-2.5.0-16.1.x86_64.rpm.html
http://rpm.pbone.net/index.php3/stat/4/idpl/23552169/dir/centos_6/com/protobuf-devel-2.5.0-16.1.x86_64.rpm.html
2.1) Download protobuf 3.6 from :
https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protobuf-java-3.6.1.zip

2.2) Install Protobufs
$> sudo yum install protobuf
$> sudo yum install protobuf-compiler
$> sudo yum install protobuf-devel
$> unzip protobuf-java-3.6.1.zip
$> cd protobuf-3.6.1
$> ./configure
$> sudo make
$> sudo make install

3)
3.1) Install Zookeeper prerequisites
Expand Down
2 changes: 1 addition & 1 deletion contrib/native/client/readme.macos
Expand Up @@ -36,7 +36,7 @@ Install Prerequisites
2.0) Install cppunit
$> brew install cppunit

2.1) Install protobuf 2.5.0 (or higher)
2.1) Install protobuf 3.6.1 (or higher)
$> brew install protobuf

2.2) Install zookeeper
Expand Down
4 changes: 2 additions & 2 deletions contrib/native/client/readme.win.txt
Expand Up @@ -118,8 +118,8 @@ Windows platforms should be more or less similar.
iii) If you do not have the 64 bit assembler installed, boost-context does not
build. It is safe to ignore it as boost-context is not needed for Drill

2.2 Protobuf (2.5.0)
Get protobuf from here: https://protobuf.googlecode.com/files/protobuf-2.5.0.zip
2.2 Protobuf (3.6.1)
Get protobuf from here: https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-win32.zip

a) Protobuf builds static libraries
b) In Visual Studio, open <PROTOBUF_HOME>/vsprojects/protobuf.sln. The IDE may
Expand Down

0 comments on commit 2c3e2de

Please sign in to comment.