From 2662646eafaf63c4be7ba337eee3e892fd8e0b6b Mon Sep 17 00:00:00 2001 From: Rong Ma Date: Thu, 31 Oct 2024 07:50:32 +0800 Subject: [PATCH] [GLUTEN-6887][VL] Daily Update Velox Version (2024_10_30) (#7722) velox changes: ``` b1834bde0 by Kevin Wilfong, Fix format_datetime to used linked TimeZone names (#11337) 3bcc5f385 by Kevin Wilfong, Throw for zzzz (and beyond) in parse_datetime (#11331) 1b5b013a7 by Kevin Wilfong, Add support for zzzz (and beyond) in format_datetime (#11330) b31a48e6a by Kevin Wilfong, Add support for z, zz, zzz in format_datetime (#11323) f6dbb3dd6 by Kevin Wilfong, Add support for ZZZ in parse_datetime (#11312) d94043478 by Kevin Wilfong, Fix Presto'\''s format_datetime function with time zone (#11283) 48f6b8dda by Guilherme Kunigami, add opaque type support to vector fuzzer (#11189) ca8dba41e by Christian Zentgraf, Unify and utilize NPROC variable for Linux setup scripts (#11366) d47191224 by Chengcheng Jin, Reserve memory for SortWindowBuild sort process (#11370) e67f11bbd by Wei He, Support expression transformers in expression fuzzer (#11264) 6440a44b3 by joey.ljy, Support DELTA_BYTE_ARRAY encoding in native Parquet reader (#10589) 2e0acb777 by Jimmy Lu, Add Row ID column reading support (#11363) 27d05274f by Xiaoxuan Meng, Fix tsan flaky test MockSharedArbitrationTest.concurrentArbitrationWithTransientRoots (#11365) ``` --- cpp/velox/CMakeLists.txt | 13 +++++++++++++ ep/build-velox/src/get_velox.sh | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt index 47e4ff8f1382..b16de0032a04 100644 --- a/cpp/velox/CMakeLists.txt +++ b/cpp/velox/CMakeLists.txt @@ -300,6 +300,19 @@ endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK}) +set(icu_components i18n uc data) +foreach(component ${icu_components}) + find_library(ICU_${component}_LIB NAMES icu${component}) + if(NOT ICU_${component}_LIB) + message(FATAL_ERROR "icu${component} library not found") + endif() + message(STATUS "Found ICU::${component}: ${ICU_${component}_LIB}") + add_library(ICU::${component} UNKNOWN IMPORTED) + set_target_properties(ICU::${component} PROPERTIES IMPORTED_LOCATION + ${ICU_${component}_LIB}) + target_link_libraries(velox PUBLIC ICU::${component}) +endforeach() + if(BUILD_TESTS) add_subdirectory(tests) endif() diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index adbe1519bc45..a881b403b6e0 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_10_29 +VELOX_BRANCH=2024_10_30 VELOX_HOME="" OS=`uname -s`