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

Update Azure Connector Dependencis to consume file-datalake #7688

Closed
wants to merge 2 commits into from
Closed

Update Azure Connector Dependencis to consume file-datalake #7688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead4f49
update azure sdk dependencies install sciprt
Nov 22, 2023
8258911
Merge branch 'facebookincubator:main' into gayangya/update_azuresdk
gaoyangxiaozhu Nov 22, 2023
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ if(VELOX_ENABLE_ABFS)
if(AZURESDK_ROOT_DIR)
list(APPEND CMAKE_PREFIX_PATH ${AZURESDK_ROOT_DIR})
endif()
find_package(azure-storage-blobs-cpp CONFIG REQUIRED)
# files-datalake is built on blobs
find_package(azure-storage-files-datalake-cpp CONFIG REQUIRED)
add_definitions(-DVELOX_ENABLE_ABFS)
endif()

Expand Down
14 changes: 9 additions & 5 deletions scripts/setup-adapters.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ function install_gcs-sdk-cpp {
}

function install_azure-storage-sdk-cpp {
github_checkout azure/azure-sdk-for-cpp azure-storage-blobs_12.8.0
vcpkg_commit_id=7a6f366cefd27210f6a8309aed10c31104436509
github_checkout azure/azure-sdk-for-cpp azure-storage-files-datalake_12.8.0
sed -i "s/set(VCPKG_COMMIT_STRING .*)/set(VCPKG_COMMIT_STRING $vcpkg_commit_id)/" cmake-modules/AzureVcpkg.cmake

cd sdk/core/azure-core
if ! grep -q "baseline" vcpkg.json; then
Expand All @@ -71,7 +73,7 @@ function install_azure-storage-sdk-cpp {
if [[ "$openssl_version" == 1.1.1* ]]; then
openssl_version="1.1.1n"
fi
sed -i 's/"version-string"/"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa","version-string"/' vcpkg.json
sed -i "s/\"version-string\"/\"builtin-baseline\": \"$vcpkg_commit_id\",\"version-string\"/" vcpkg.json
sed -i "s/\"version-string\"/\"overrides\": [{ \"name\": \"openssl\", \"version-string\": \"$openssl_version\" }],\"version-string\"/" vcpkg.json
fi
cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
Expand All @@ -84,9 +86,11 @@ function install_azure-storage-sdk-cpp {
cd -
# install azure-storage-blobs
cd sdk/storage/azure-storage-blobs
if ! grep -q "baseline" vcpkg.json; then
sed -i 's/"version-semver"/"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa","version-semver"/' vcpkg.json
fi
cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF

cd -
# install azure-storage-files-datalake
cd sdk/storage/azure-storage-files-datalake
cmake_install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
}

Expand Down