You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/07/26 00:47:39 UTC
[arrow] branch master updated: ARROW-17051: [C++] Link Flight/gRPC/Protobuf consistently (#13599)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new bbf249e056 ARROW-17051: [C++] Link Flight/gRPC/Protobuf consistently (#13599)
bbf249e056 is described below
commit bbf249e056315af0a18d5c0834de9adef117a25f
Author: David Li <li...@gmail.com>
AuthorDate: Mon Jul 25 20:47:29 2022 -0400
ARROW-17051: [C++] Link Flight/gRPC/Protobuf consistently (#13599)
If Protobuf/gRPC are used statically, Flight must be as well, or else we can get odd runtime behavior due to the global state in those libraries when Flight SQL is involved (as Flight SQL would then bundle a second copy of Protobuf into its shared library).
Authored-by: David Li <li...@gmail.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
.travis.yml | 2 --
ci/docker/ubuntu-18.04-cpp.dockerfile | 5 ++++-
ci/docker/ubuntu-20.04-cpp.dockerfile | 5 ++++-
ci/docker/ubuntu-22.04-cpp.dockerfile | 5 ++++-
cpp/CMakeLists.txt | 2 +-
cpp/src/arrow/flight/CMakeLists.txt | 42 +++++++++++++++++------------------
docker-compose.yml | 1 -
7 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b3aa724107..5038f66181 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,7 +93,6 @@ jobs:
# aws-sdk-cpp.
DOCKER_RUN_ARGS: >-
"
- -e ARROW_BUILD_STATIC=OFF
-e ARROW_FLIGHT=ON
-e ARROW_GCS=OFF
-e ARROW_MIMALLOC=OFF
@@ -145,7 +144,6 @@ jobs:
# aws-sdk-cpp.
DOCKER_RUN_ARGS: >-
"
- -e ARROW_BUILD_STATIC=OFF
-e ARROW_FLIGHT=ON
-e ARROW_GCS=OFF
-e ARROW_MIMALLOC=OFF
diff --git a/ci/docker/ubuntu-18.04-cpp.dockerfile b/ci/docker/ubuntu-18.04-cpp.dockerfile
index 16490845bd..0e20b7c6a8 100644
--- a/ci/docker/ubuntu-18.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-18.04-cpp.dockerfile
@@ -98,7 +98,10 @@ RUN apt-get update -y -q && \
# - thrift is too old
# - utf8proc is too old(v2.1.0)
# - s3 tests would require boost-asio that is included since Boost 1.66.0
-ENV ARROW_BUILD_TESTS=ON \
+# ARROW-17051: this build uses static Protobuf, so we must also use
+# static Arrow to run Flight/Flight SQL tests
+ENV ARROW_BUILD_STATIC=ON \
+ ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_FLIGHT=OFF \
diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile
index ae15835520..24d5f8e5da 100644
--- a/ci/docker/ubuntu-20.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-20.04-cpp.dockerfile
@@ -123,7 +123,10 @@ RUN /arrow/ci/scripts/install_ceph.sh
# - flatbuffer is not packaged
# - libgtest-dev only provide sources
# - libprotobuf-dev only provide sources
-ENV ARROW_BUILD_TESTS=ON \
+# ARROW-17051: this build uses static Protobuf, so we must also use
+# static Arrow to run Flight/Flight SQL tests
+ENV ARROW_BUILD_STATIC=ON \
+ ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_DATASET=ON \
ARROW_FLIGHT=OFF \
diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile
index e7d2842dfc..c2019df153 100644
--- a/ci/docker/ubuntu-22.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-22.04-cpp.dockerfile
@@ -150,7 +150,10 @@ RUN /arrow/ci/scripts/install_gcs_testbench.sh default
# - flatbuffer is not packaged
# - libgtest-dev only provide sources
# - libprotobuf-dev only provide sources
-ENV ARROW_BUILD_TESTS=ON \
+# ARROW-17051: this build uses static Protobuf, so we must also use
+# static Arrow to run Flight/Flight SQL tests
+ENV ARROW_BUILD_STATIC=ON \
+ ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_DATASET=ON \
ARROW_FLIGHT=ON \
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index b67f90e0bd..945ff7b6f8 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -862,7 +862,7 @@ add_dependencies(arrow_test_dependencies toolchain-tests)
if(ARROW_STATIC_LINK_LIBS)
add_dependencies(arrow_dependencies ${ARROW_STATIC_LINK_LIBS})
- if(ARROW_ORC)
+ if(ARROW_HDFS OR ARROW_ORC)
if(NOT MSVC_TOOLCHAIN)
list(APPEND ARROW_STATIC_LINK_LIBS ${CMAKE_DL_LIBS})
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS ${CMAKE_DL_LIBS})
diff --git a/cpp/src/arrow/flight/CMakeLists.txt b/cpp/src/arrow/flight/CMakeLists.txt
index 39f2fecdde..a4bb287dfe 100644
--- a/cpp/src/arrow/flight/CMakeLists.txt
+++ b/cpp/src/arrow/flight/CMakeLists.txt
@@ -36,28 +36,28 @@ if(NOT ARROW_GRPC_USE_SHARED)
endif()
set(ARROW_FLIGHT_TEST_INTERFACE_LIBS)
-if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
- if(ARROW_BUILD_STATIC)
- set(ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_static)
- else()
- set(ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_shared)
- endif()
- if(ARROW_FLIGHT_TESTING_BUILD_STATIC)
- list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_testing_static)
+if(ARROW_BUILD_INTEGRATION OR ARROW_BUILD_TESTS)
+ if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
+ if(NOT ARROW_BUILD_STATIC)
+ message(STATUS "If static Protobuf or gRPC are used, Arrow must be built statically"
+ )
+ message(STATUS "(These libraries have global state, and linkage must be consistent)"
+ )
+ message(FATAL_ERROR "Must build Arrow statically to link Flight tests statically")
+ endif()
+ set(ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_static arrow_flight_testing_static)
+ list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS ${ARROW_TEST_STATIC_LINK_LIBS})
+ if(ARROW_CUDA)
+ list(APPEND ARROW_FLIGHT_TEST_INTERFACE_LIBS arrow_cuda_static)
+ list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS arrow_cuda_static)
+ endif()
else()
- list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_testing_shared)
- endif()
- list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS ${ARROW_TEST_LINK_LIBS})
- if(ARROW_CUDA)
- list(APPEND ARROW_FLIGHT_TEST_INTERFACE_LIBS arrow_cuda_static)
- list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS arrow_cuda_static)
- endif()
-else()
- set(ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_shared arrow_flight_testing_shared
- ${ARROW_TEST_LINK_LIBS})
- if(ARROW_CUDA)
- list(APPEND ARROW_FLIGHT_TEST_INTERFACE_LIBS arrow_cuda_shared)
- list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS arrow_cuda_shared)
+ set(ARROW_FLIGHT_TEST_LINK_LIBS arrow_flight_shared arrow_flight_testing_shared
+ ${ARROW_TEST_SHARED_LINK_LIBS})
+ if(ARROW_CUDA)
+ list(APPEND ARROW_FLIGHT_TEST_INTERFACE_LIBS arrow_cuda_shared)
+ list(APPEND ARROW_FLIGHT_TEST_LINK_LIBS arrow_cuda_shared)
+ endif()
endif()
endif()
list(APPEND
diff --git a/docker-compose.yml b/docker-compose.yml
index c476797f22..13d7a4da4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -487,7 +487,6 @@ services:
<<: *ccache
CC: clang-${CLANG_TOOLS}
CXX: clang++-${CLANG_TOOLS}
- ARROW_BUILD_STATIC: "OFF"
ARROW_ENABLE_TIMING_TESTS: # inherit
ARROW_FUZZING: "ON" # Check fuzz regressions
ARROW_JEMALLOC: "OFF"