Skip to content

ARROW-8147: [C++] Add google-cloud-cpp to ThirdpartyToolchain #8757

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

Closed
josiahyan wants to merge 10 commits into from
Closed

ARROW-8147: [C++] Add google-cloud-cpp to ThirdpartyToolchain #8757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6600fb5
ARROW-8147: [C++] Add google-cloud-cpp to ThirdpartyToolchain
josiahyan Nov 24, 2020
17d3636
Add google-cloud-cpp to conda requirements for CI
josiahyan Nov 24, 2020
72cb6f0
Add dependency on nlohmann_json for google-cloud-cpp build
josiahyan Nov 25, 2020
69b5799
Move google-cloud-cpp conda dependencies to unix only
josiahyan Nov 25, 2020
433eca0
Reorder dependencies, minor fixes
josiahyan Dec 1, 2020
46e9dcc
Add URLs to fetch dependencies to cpp/thirdparty/versions.txt
josiahyan Dec 1, 2020
99852f9
Lock GCP SDK version to 1.20.0
josiahyan Feb 28, 2021
cb06b47
Remove GCS SDK from Windows cpp appveyor CI build
josiahyan Feb 28, 2021
7531ca5
Resynchronize GCS SDK's Abseil includes against Abseil LTS branch, Se…
josiahyan Feb 28, 2021
d92433a
Fix typo
josiahyan Aug 23, 2021
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
2 changes: 2 additions & 0 deletions ci/conda_env_unix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@

autoconf
ccache
google-cloud-cpp=1.20.0
nlohmann_json>=3.4.0
Copy link
Contributor

@emkornfield emkornfield Sep 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the new JSON dependency for?

Copy link
Contributor

@emkornfield emkornfield Sep 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess google's SDK must rely on it?

Copy link
Contributor

@coryan coryan Sep 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am one of the authors of google's GCS SDK. Yes, the SDK definitely depends on nlohmann_json.

Copy link
Member

@pitrou pitrou Sep 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conda has dependency handling, so there is no reason to mention it explicitly, though.

orc
pkg-config
1 change: 1 addition & 0 deletions ci/docker/conda-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ENV ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=CONDA \
ARROW_FLIGHT=ON \
ARROW_GANDIVA=ON \
ARROW_GCS=ON \
ARROW_HOME=$CONDA_PREFIX \
ARROW_ORC=ON \
ARROW_PARQUET=ON \
Expand Down
2 changes: 2 additions & 0 deletions ci/docker/ubuntu-20.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ ENV ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
ARROW_FLIGHT=OFF \
ARROW_GANDIVA=ON \
ARROW_GCS=ON \
ARROW_HDFS=ON \
ARROW_HOME=/usr/local \
ARROW_INSTALL_NAME_RPATH=OFF \
Expand All @@ -129,6 +130,7 @@ ENV ARROW_BUILD_TESTS=ON \
ARROW_WITH_ZSTD=ON \
ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-${llvm}/bin/llvm-symbolizer \
AWSSDK_SOURCE=BUNDLED \
GCPSDK_SOURCE=BUNDLED \
GTest_SOURCE=BUNDLED \
gRPC_SOURCE=BUNDLED \
ORC_SOURCE=BUNDLED \
Expand Down
2 changes: 2 additions & 0 deletions ci/scripts/cpp_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
-DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
-DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
-DARROW_GCS=${ARROW_GCS:-OFF} \
-DARROW_HDFS=${ARROW_HDFS:-ON} \
-DARROW_HIVESERVER2=${ARROW_HIVESERVER2:-OFF} \
-DARROW_INSTALL_NAME_RPATH=${ARROW_INSTALL_NAME_RPATH:-ON} \
Expand Down Expand Up @@ -120,6 +121,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
-DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
-DGCPSDK_SOURCE=${GCPSDK_SOURCE:-} \
-Dgflags_SOURCE=${gflags_SOURCE:-} \
-DgRPC_SOURCE=${gRPC_SOURCE:-} \
-DGTest_SOURCE=${GTest_SOURCE:-} \
Expand Down
8 changes: 8 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,14 @@ if(ARROW_S3)
list(APPEND ARROW_STATIC_LINK_LIBS ${AWSSDK_LINK_LIBRARIES})
endif()

if(ARROW_GCS)
list(APPEND ARROW_LINK_LIBS storage_client)
list(APPEND ARROW_STATIC_LINK_LIBS storage_client)
if(GCPSDK_SOURCE STREQUAL "SYSTEM")
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS storage_client)
endif()
endif()

if(ARROW_WITH_UTF8PROC)
list(APPEND ARROW_LINK_LIBS utf8proc::utf8proc)
list(APPEND ARROW_STATIC_LINK_LIBS utf8proc::utf8proc)
Expand Down
4 changes: 4 additions & 0 deletions cpp/cmake_modules/DefineOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

define_option(ARROW_GCS
"Build Arrow with GCS support (requires the GCloud SDK for C++)" OFF)
mark_as_advanced(ARROW_GCS) # remove when GCS implementation is complete

define_option(ARROW_HDFS "Build the Arrow HDFS bridge" OFF)

define_option(ARROW_HIVESERVER2 "Build the HiveServer2 client and Arrow adapter" OFF)
Expand Down
Loading