Merge pull request #941 from regro-cf-autotick-bot/11.0.0_h398140

arrow-cpp v11.0.0

conda-forge.yml

@@ -5,6 +5,7 @@ bot:
   - 7.0.x
   - 8.0.x
   - 9.0.x
+  - 10.0.x
 build_platform:
   linux_aarch64: linux_64
   linux_ppc64le: linux_64

recipe/bld-arrow.bat

@@ -14,6 +14,11 @@ if "%cuda_compiler_version%"=="None" (
     set "EXTRA_CMAKE_ARGS=-DARROW_CUDA=ON"
 )
 
+:: # reusable variable for dependencies we cannot yet unvendor
+set "READ_RECIPE_META_YAML_WHY_NOT=OFF"
+
+:: for available switches see
+:: https://github.com/apache/arrow/blame/apache-arrow-11.0.0/cpp/cmake_modules/DefineOptions.cmake
 cmake -G "Ninja" ^
       -DARROW_BOOST_USE_SHARED:BOOL=ON ^
       -DARROW_BUILD_STATIC:BOOL=OFF ^
@@ -42,6 +47,8 @@ cmake -G "Ninja" ^
       -DARROW_WITH_BROTLI:BOOL=ON ^
       -DARROW_WITH_BZ2:BOOL=ON ^
       -DARROW_WITH_LZ4:BOOL=ON ^
+      -DARROW_WITH_NLOHMANN_JSON:BOOL=ON ^
+      -DARROW_WITH_OPENTELEMETRY:BOOL=%READ_RECIPE_META_YAML_WHY_NOT% ^
       -DARROW_WITH_SNAPPY:BOOL=ON ^
       -DARROW_WITH_ZLIB:BOOL=ON ^
       -DARROW_WITH_ZSTD:BOOL=ON ^

recipe/build-arrow.sh

@@ -18,10 +18,13 @@ EXTRA_CMAKE_ARGS=""
 if [ "$(uname)" == "Linux" ]; then
   SYSTEM_INCLUDES=$(echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep '^ ' | awk '{print "-isystem;" substr($1, 1)}' | tr '\n' ';')
   ARROW_GANDIVA_PC_CXX_FLAGS="${SYSTEM_INCLUDES}"
+  # only available on linux so far
+  ARROW_WITH_UCX=ON
 else
   # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
   CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
   ARROW_GANDIVA_PC_CXX_FLAGS="-D_LIBCPP_DISABLE_AVAILABILITY"
+  ARROW_WITH_UCX=OFF
 fi
 
 # Enable CUDA support
@@ -66,6 +69,11 @@ if [[ "${build_platform}" != "${target_platform}" ]]; then
     EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc"
 fi
 
+# reusable variable for dependencies we cannot yet unvendor
+export READ_RECIPE_META_YAML_WHY_NOT=OFF
+
+# for available switches see
+# https://github.com/apache/arrow/blame/apache-arrow-11.0.0/cpp/cmake_modules/DefineOptions.cmake
 cmake -GNinja \
     -DARROW_BOOST_USE_SHARED=ON \
     -DARROW_BUILD_BENCHMARKS=OFF \
@@ -100,7 +108,10 @@ cmake -GNinja \
     -DARROW_WITH_BROTLI=ON \
     -DARROW_WITH_BZ2=ON \
     -DARROW_WITH_LZ4=ON \
+    -DARROW_WITH_NLOHMANN_JSON=ON \
+    -DARROW_WITH_OPENTELEMETRY=${READ_RECIPE_META_YAML_WHY_NOT} \
     -DARROW_WITH_SNAPPY=ON \
+    -DARROW_WITH_UCX=${ARROW_WITH_UCX} \
     -DARROW_WITH_ZLIB=ON \
     -DARROW_WITH_ZSTD=ON \
     -DBUILD_SHARED_LIBS=ON \

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "10.0.1" %}
+{% set version = "11.0.0" %}
 {% set cuda_enabled = cuda_compiler_version != "None" %}
 {% set build_ext_version = "4.0.0" %}
 {% set build_ext = "cuda" if cuda_enabled else "cpu" %}
@@ -14,26 +14,21 @@ package:
 
 source:
   - url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz
-    sha256: c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3
+    sha256: 2dd8f0ea0848a58785628ee3a57675548d509e17213a2f5d72b0d900b43f5430
     patches:
-      # backport https://github.com/apache/arrow/pull/14656, can be dropped for v>=11
-      - patches/0001-ARROW-18340-Python-PyArrow-C-header-files-no-longer-.patch
-      # switch off tests that require the as-yet unpackaged
-      # https://github.com/googleapis/storage-testbench
-      - patches/0002-properly-skip-if-instantiation-of-gcs_server-gcfs-fi.patch
       # gdb-integration needs full path to shared library, see
       # https://github.com/apache/arrow/blob/master/docs/source/cpp/gdb.rst#manual-loading
       # however, baking the installation-env into the path for the gdb-file cannot work
       # with the usual relocation treatement and leads to other issues, see #935;
       # replace with placeholder that allows interested users to fix the file path
-      - patches/0003-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch
+      - patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch
   # testing-submodule not part of release tarball
   - git_url: https://github.com/apache/arrow-testing.git
     git_rev: 00c483283433b4c02cb811f260dbe35414c806a4
     folder: testing
 
 build:
-  number: 6
+  number: 0
   # for cuda support, building with one version is enough to be compatible with
   # all later versions, since arrow is only using libcuda, and not libcudart.
   skip: true  # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
@@ -103,6 +98,8 @@ outputs:
         - autoconf     # [linux]
         - make         # [linux]
       host:
+        # for required dependencies, see
+        # https://github.com/apache/arrow/blob/apache-arrow-11.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake#L46-L75
         - clangdev {{ llvm_version }}
         - llvmdev {{ llvm_version }}
         - aws-crt-cpp  # [unix]
@@ -111,9 +108,14 @@ outputs:
         - brotli
         - bzip2
         - c-ares
+        # not yet: https://github.com/conda-forge/cpp-opentelemetry-sdk-feedstock/issues/38
+        # - cpp-opentelemetry-sdk
+        # - proto-opentelemetry-proto =={{ cpp_opentelemetry_sdk }}
         - gflags
         - glog
         - google-cloud-cpp
+        # arrow uses a customized jemalloc, see #944
+        # - jemalloc
         - libabseil
         # since libgoogle-cloud is static on windows, see
         # https://github.com/conda-forge/google-cloud-cpp-feedstock/pull/108,
@@ -124,13 +126,16 @@ outputs:
         - libprotobuf
         - libutf8proc
         - lz4-c
+        - nlohmann_json
         # gandiva depends on openssl
         - openssl
+        # not on windows yet: https://github.com/conda-forge/orc-feedstock/issues/54
         - orc          # [unix]
         - rapidjson
         - re2
         - snappy
         - thrift-cpp
+        - ucx          # [linux]
         - xsimd
         - zlib
         - zstd

recipe/patches/0003-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch → recipe/patches/0001-don-t-bake-non-relocatable-CMAKE_INSTALL_FULL_LIBDIR.patch

@@ -1,18 +1,18 @@
-From 7b0b770b7c35218de9e68e9c5fd2f2212cf56e07 Mon Sep 17 00:00:00 2001
+From 7f1350d76bf71a8123cf78abe18ddb5876a7ca80 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Thu, 26 Jan 2023 12:37:02 +1100
-Subject: [PATCH 3/3] don't bake non-relocatable CMAKE_INSTALL_FULL_LIBDIR into
+Subject: [PATCH] don't bake non-relocatable CMAKE_INSTALL_FULL_LIBDIR into
  gdb-integration
 
 ---
  cpp/src/arrow/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
-index 099a86237..cd6d15e8b 100644
+index 90ab1e6ac..c1f51e0da 100644
 --- a/cpp/src/arrow/CMakeLists.txt
 +++ b/cpp/src/arrow/CMakeLists.txt
-@@ -620,7 +620,7 @@ if(ARROW_BUILD_SHARED AND NOT WIN32)
+@@ -644,7 +644,7 @@ if(ARROW_BUILD_SHARED AND NOT WIN32)
      endif()
    else()
      set(ARROW_GDB_AUTO_LOAD_LIBARROW_GDB_DIR