From d05e3f82303cfcefac7386d24f94ddf1aecfe5e1 Mon Sep 17 00:00:00 2001 From: glutenperfbot Date: Fri, 21 Jun 2024 01:12:33 +0000 Subject: [PATCH 1/2] [VL] Daily Update Velox Version (2024_06_21) Signed-off-by: glutenperfbot --- ep/build-velox/src/get_velox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index e4f71214efcf..a0a7baa0da45 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -17,7 +17,7 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=2024_06_20 +VELOX_BRANCH=2024_06_21 VELOX_HOME="" #Set on run gluten on HDFS From 4df537f726534c9a339af4917f72647141cd5ea2 Mon Sep 17 00:00:00 2001 From: Jia Ke Date: Fri, 21 Jun 2024 17:22:23 +0800 Subject: [PATCH 2/2] Remove the pb changes --- ep/build-velox/src/modify_velox.patch | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ep/build-velox/src/modify_velox.patch b/ep/build-velox/src/modify_velox.patch index 81560917d620..aee406c3eae0 100644 --- a/ep/build-velox/src/modify_velox.patch +++ b/ep/build-velox/src/modify_velox.patch @@ -68,14 +68,6 @@ index 5c7bf770a..9f897f577 100644 if(NOT TARGET gflags::gflags) # This is a bit convoluted, but we want to be able to use gflags::gflags as a # target even when velox is built as a subproject which uses -@@ -441,7 +446,7 @@ if(${VELOX_BUILD_MINIMAL_WITH_DWIO} - - # Locate or build protobuf. - set_source(Protobuf) -- resolve_dependency(Protobuf 3.21.4 EXACT) -+ resolve_dependency(Protobuf 3.21 EXACT) - include_directories(${Protobuf_INCLUDE_DIRS}) - endif() diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index ce4c24dbe..785a2acc6 100644