Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade protobuf to v26 #9551

Closed
wants to merge 4 commits into from
Closed

Upgrade protobuf to v26 #9551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aa00df
Upgrade protobuf version
majetideepak Apr 19, 2024
5ba1b62
upgrade doc
majetideepak Apr 19, 2024
aab9f3c
cleanup
majetideepak Apr 20, 2024
15f714c
fix checksum
majetideepak Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/resolve_dependency_modules/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ by Velox. See details on bundling below.
| xz | default | No |
| zstd | default | No |
| openssl | default | No |
| protobuf | 21 (exact) | Yes |
| protobuf | 26 | Yes |
| boost | 1.77.0 | Yes |
| flex | 2.5.13 | No |
| bison | 3.0.4 | No |
Expand Down
6 changes: 3 additions & 3 deletions CMake/resolve_dependency_modules/protobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
# limitations under the License.
include_guard(GLOBAL)

set(VELOX_PROTOBUF_BUILD_VERSION 21.4)
set(VELOX_PROTOBUF_BUILD_VERSION 26.1)
set(VELOX_PROTOBUF_BUILD_SHA256_CHECKSUM
6c5e1b0788afba4569aeebb2cfe205cb154aa01deacaba0cd26442f3b761a836)
4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8)
string(
CONCAT
VELOX_PROTOBUF_SOURCE_URL
"https://github.com/protocolbuffers/protobuf/releases/download/"
"v${VELOX_PROTOBUF_BUILD_VERSION}/protobuf-all-${VELOX_PROTOBUF_BUILD_VERSION}.tar.gz"
"v${VELOX_PROTOBUF_BUILD_VERSION}/protobuf-${VELOX_PROTOBUF_BUILD_VERSION}.tar.gz"
)

resolve_dependency_url(PROTOBUF)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ if(${VELOX_BUILD_MINIMAL_WITH_DWIO}
OR ${VELOX_ENABLE_SUBSTRAIT})
# Locate or build protobuf.
set_source(Protobuf)
resolve_dependency(Protobuf 3.21 EXACT)
resolve_dependency(Protobuf 3.26)
include_directories(${Protobuf_INCLUDE_DIRS})
endif()

Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-centos8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function install_fmt {
}

function install_protobuf {
wget_and_untar https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protobuf-all-21.4.tar.gz protobuf
wget_and_untar https://github.com/protocolbuffers/protobuf/releases/download/v26.1/protobuf-26.1.tar.gz protobuf
(
cd protobuf
./configure --prefix=/usr
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ source $SCRIPTDIR/setup-helper-functions.sh
NPROC=$(getconf _NPROCESSORS_ONLN)

DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
MACOS_VELOX_DEPS="flex bison protobuf@21 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium"
MACOS_VELOX_DEPS="flex bison protobuf@26 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium"
MACOS_BUILD_DEPS="ninja cmake ccache"
FB_OS_VERSION="v2024.04.01.00"

Expand Down
2 changes: 1 addition & 1 deletion scripts/velox_env_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies:
- libaio
- libdwarf-dev
- libevent
- libprotobuf=3.21
- libprotobuf=3.26
- libsodium
- libtool
- libunwind
Expand Down
2 changes: 1 addition & 1 deletion scripts/velox_env_mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies:
- gtest=1.13
- libdwarf-dev
- libevent
- libprotobuf=3.21
- libprotobuf=3.26
- libsodium
- libtool
- lz4-c
Expand Down
Loading