From cea55d12de0f4e50856a6c1eaf9a12e2eef48021 Mon Sep 17 00:00:00 2001 From: glutenperfbot Date: Fri, 22 Mar 2024 00:29:55 +0000 Subject: [PATCH 1/2] [VL] Daily Update Velox Version (2024_03_22) 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 0fee29c24bf4..2f3b5548d9cb 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_03_21 +VELOX_BRANCH=2024_03_22 VELOX_HOME="" #Set on run gluten on HDFS From 3b81d38ecff605a21ce35acc73e8cd7be81b66b8 Mon Sep 17 00:00:00 2001 From: yan ma Date: Fri, 22 Mar 2024 20:12:46 +0800 Subject: [PATCH 2/2] fix build issue --- cpp/velox/substrait/VariantToVectorConverter.cc | 2 +- ep/build-velox/src/get_velox.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cpp/velox/substrait/VariantToVectorConverter.cc b/cpp/velox/substrait/VariantToVectorConverter.cc index 0fa8ccbbd3ca..f8c9c11f0f37 100644 --- a/cpp/velox/substrait/VariantToVectorConverter.cc +++ b/cpp/velox/substrait/VariantToVectorConverter.cc @@ -57,7 +57,7 @@ VectorPtr setVectorFromVariantsByKind( if (values[i].isNull()) { flatVector->setNull(i, true); } else { - flatVector->set(i, StringView(values[i].value())); + flatVector->set(i, StringView(values[i].value())); } } return flatVector; diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index 2f3b5548d9cb..26faf289fb01 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -83,6 +83,8 @@ function process_setup_ubuntu { # No need to re-install git. sed -i '/git \\/d' scripts/setup-ubuntu.sh + # need set BUILD_SHARED_LIBS flag for thrift + sed -i "/facebook\/fbthrift/{n;s/cmake_install -DBUILD_TESTS=OFF/cmake_install -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF/;}" scripts/setup-ubuntu.sh # Do not install libunwind which can cause interruption when catching native exception. sed -i 's/sudo --preserve-env apt install -y libunwind-dev && //' scripts/setup-ubuntu.sh sed -i '/ccache/a\ *thrift* \\' scripts/setup-ubuntu.sh @@ -128,6 +130,8 @@ function process_setup_centos8 { fi # make this function Reentrant git checkout scripts/setup-centos8.sh + # need set BUILD_SHARED_LIBS flag for thrift + sed -i "/cd fbthrift/{n;s/cmake_install -Denable_tests=OFF/cmake_install -Denable_tests=OFF -DBUILD_SHARED_LIBS=OFF/;}" scripts/setup-centos8.sh # No need to re-install git. sed -i 's/dnf_install ninja-build cmake curl ccache gcc-toolset-9 git/dnf_install ninja-build cmake curl ccache gcc-toolset-9/' scripts/setup-centos8.sh sed -i '/^function dnf_install/i\DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}' scripts/setup-centos8.sh @@ -315,6 +319,8 @@ function setup_macos { fi sed -i '' $'/^ run_and_time install_double_conversion/a\\\n run_and_time install_folly\\\n' scripts/setup-macos.sh + # need set BUILD_SHARED_LIBS flag for thrift + sed -i "/facebook\/fbthrift/{n;s/cmake_install -DBUILD_TESTS=OFF/cmake_install -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF/;}" scripts/setup-macos.sh } if [ $OS == 'Linux' ]; then