From cd47a64ee9ec299d66d059eee32ea9035f941bf8 Mon Sep 17 00:00:00 2001 From: Yan Ma Date: Wed, 20 Dec 2023 20:05:11 +0800 Subject: [PATCH] [VL] update aws-sdk-cpp version to 1.11.169 (#4103) Current aws-sdk-cpp version(1.11.4) in static build has deadlock and [memory issues, so update to 1.11.169. --- dev/vcpkg/vcpkg.json | 1 + ep/build-velox/src/get_velox.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/vcpkg/vcpkg.json b/dev/vcpkg/vcpkg.json index 01db2c2c8469..59f6bf5e0b03 100644 --- a/dev/vcpkg/vcpkg.json +++ b/dev/vcpkg/vcpkg.json @@ -56,6 +56,7 @@ "dependencies": [ { "name": "aws-sdk-cpp", + "version>=": "1.11.169", "features": [ "identity-management", "s3", diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index ee74baf7b067..dbfb115faafa 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -107,7 +107,7 @@ function process_setup_ubuntu { sed -i '/^ run_and_time install_fmt/a \ \ run_and_time install_protobuf' scripts/setup-ubuntu.sh fi if [ $ENABLE_S3 == "ON" ]; then - sed -i '/^function install_fmt.*/i function install_awssdk {\n github_checkout aws/aws-sdk-cpp 1.9.379 --depth 1 --recurse-submodules\n cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DMINIMIZE_SIZE:BOOL=ON -DENABLE_TESTING:BOOL=OFF -DBUILD_ONLY:STRING="s3;identity-management" \n} \n' scripts/setup-ubuntu.sh + sed -i '/^function install_fmt.*/i function install_awssdk {\n github_checkout aws/aws-sdk-cpp 1.11.169 --depth 1 --recurse-submodules\n cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DMINIMIZE_SIZE:BOOL=ON -DENABLE_TESTING:BOOL=OFF -DBUILD_ONLY:STRING="s3;identity-management" \n} \n' scripts/setup-ubuntu.sh sed -i '/^ run_and_time install_fmt/a \ \ run_and_time install_awssdk' scripts/setup-ubuntu.sh fi if [ $ENABLE_GCS == "ON" ]; then @@ -147,7 +147,7 @@ function process_setup_centos8 { sed -i '/^cmake_install_deps fmt/a \\install_protobuf' scripts/setup-centos8.sh fi if [ $ENABLE_S3 == "ON" ]; then - sed -i '/^function cmake_install_deps.*/i function install_awssdk {\n github_checkout aws/aws-sdk-cpp 1.9.379 --depth 1 --recurse-submodules\n cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DMINIMIZE_SIZE:BOOL=ON -DENABLE_TESTING:BOOL=OFF -DBUILD_ONLY:STRING="s3;identity-management" \n} \n' scripts/setup-centos8.sh + sed -i '/^function cmake_install_deps.*/i function install_awssdk {\n github_checkout aws/aws-sdk-cpp 1.11.169 --depth 1 --recurse-submodules\n cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DMINIMIZE_SIZE:BOOL=ON -DENABLE_TESTING:BOOL=OFF -DBUILD_ONLY:STRING="s3;identity-management" \n} \n' scripts/setup-centos8.sh sed -i '/^cmake_install_deps fmt/a \ \ install_awssdk' scripts/setup-centos8.sh fi if [ $ENABLE_GCS == "ON" ]; then