apache · xhochy · Oct 7, 2020 · Nov 10, 2020 · Nov 12, 2020 · Nov 12, 2020
diff --git a/cpp/Brewfile b/cpp/Brewfile
@@ -25,7 +25,6 @@ brew "flatbuffers"
 brew "git"
 brew "glog"
 brew "grpc"
-brew "llvm"
 brew "llvm@8"
 brew "lz4"
 brew "minio"

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -768,6 +768,8 @@ if(MSVC AND ARROW_USE_STATIC_CRT)
   set(Boost_USE_STATIC_RUNTIME ON)
 endif()
 set(Boost_ADDITIONAL_VERSIONS
+    "1.74.0"
+    "1.74"
     "1.73.0"
     "1.73"
     "1.72.0"
@@ -1344,6 +1346,7 @@ macro(build_protobuf)
         -DBUILD_SHARED_LIBS=OFF
         -DCMAKE_INSTALL_LIBDIR=lib
         "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
+        -Dprotobuf_MSVC_STATIC_RUNTIME=OFF
         -Dprotobuf_BUILD_TESTS=OFF
         -Dprotobuf_DEBUG_POSTFIX=)
     if(ZLIB_ROOT)
@@ -2358,6 +2361,8 @@ macro(build_grpc)
   if(GFLAGS_VENDORED)
     add_dependencies(grpc_dependencies gflags_ep)
   endif()
+  resolve_dependency(RE2)
+  add_dependencies(grpc_dependencies re2_ep)
 
   add_dependencies(grpc_dependencies ${ARROW_PROTOBUF_LIBPROTOBUF} c-ares::cares
                    ZLIB::ZLIB)
@@ -2407,6 +2412,12 @@ macro(build_grpc)
       -DgRPC_PROTOBUF_PROVIDER=package
       -DgRPC_SSL_PROVIDER=package
       -DgRPC_ZLIB_PROVIDER=package
+      -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG
+      -DgRPC_MSVC_STATIC_RUNTIME=OFF
+      -DgRPC_RE2_PROVIDER=package
+      -DRE2_ROOT_DIR=${RE2_PREFIX}
+      -Dre2_ROOT=${RE2_PREFIX}
+      -DCMAKE_POLICY_DEFAULT_CMP0074=NEW
       -DCMAKE_CXX_FLAGS=${GRPC_CMAKE_CXX_FLAGS}
       -DCMAKE_C_FLAGS=${EP_C_FLAGS}
       -DCMAKE_INSTALL_PREFIX=${GRPC_PREFIX}

diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
@@ -35,13 +35,13 @@ ARROW_CARES_BUILD_VERSION=1.16.1
 ARROW_GBENCHMARK_BUILD_VERSION=v1.5.1
 ARROW_GFLAGS_BUILD_VERSION=v2.2.2
 ARROW_GLOG_BUILD_VERSION=v0.4.0
-ARROW_GRPC_BUILD_VERSION=v1.29.1
+ARROW_GRPC_BUILD_VERSION=v1.33.2
 ARROW_GTEST_BUILD_VERSION=1.8.1
 ARROW_JEMALLOC_BUILD_VERSION=5.2.1
 ARROW_LZ4_BUILD_VERSION=v1.9.2
 ARROW_MIMALLOC_BUILD_VERSION=v1.6.4
 ARROW_ORC_BUILD_VERSION=1.6.2
-ARROW_PROTOBUF_BUILD_VERSION=v3.12.1
+ARROW_PROTOBUF_BUILD_VERSION=v3.13.0
 # Because of https://github.com/Tencent/rapidjson/pull/1323, we require
 # a pre-release version of RapidJSON to build with GCC 8 without
 # warnings.

diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
@@ -634,7 +634,7 @@ IMPORT_TESTS
 }
 
 test_linux_wheels() {
-  local py_arches="3.5m 3.6m 3.7m 3.8"
+  local py_arches="3.5m 3.6m 3.7m 3.8 3.9"
   local manylinuxes="1 2010 2014"
 
   for py_arch in ${py_arches}; do
@@ -659,7 +659,7 @@ test_linux_wheels() {
 }
 
 test_macos_wheels() {
-  local py_arches="3.5m 3.6m 3.7m 3.8"
+  local py_arches="3.5m 3.6m 3.7m 3.8 3.9"
 
   for py_arch in ${py_arches}; do
     local env=_verify_wheel-${py_arch}

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.6.____cpython.yaml
@@ -1,15 +1,15 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aws_sdk_cpp:
-- 1.8.54
+- 1.8.63
 boost_cpp:
 - 1.74.0
 bzip2:
 - '1'
 c_compiler:
 - gcc
 c_compiler_version:
-- '7.5'
+- '7'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -23,23 +23,23 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7.5'
+- '7'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gflags:
 - '2.2'
 glog:
 - 0.4.0
 grpc_cpp:
-- '1.30'
+- '1.32'
 libprotobuf:
 - '3.13'
 lz4_c:
 - 1.9.2
 numpy:
 - '1.16'
 orc:
-- 1.6.4
+- 1.6.5
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -55,11 +55,16 @@ pin_run_as_build:
 python:
 - 3.6.* *_cpython
 re2:
-- 2020.08.01
+- 2020.10.01
 snappy:
 - '1'
 target_platform:
 - linux-aarch64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - numpy
+  - python
 zlib:
 - '1.2'
 zstd:

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.7.____cpython.yaml
@@ -1,15 +1,15 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aws_sdk_cpp:
-- 1.8.54
+- 1.8.63
 boost_cpp:
 - 1.74.0
 bzip2:
 - '1'
 c_compiler:
 - gcc
 c_compiler_version:
-- '7.5'
+- '7'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -23,23 +23,23 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7.5'
+- '7'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gflags:
 - '2.2'
 glog:
 - 0.4.0
 grpc_cpp:
-- '1.30'
+- '1.32'
 libprotobuf:
 - '3.13'
 lz4_c:
 - 1.9.2
 numpy:
 - '1.16'
 orc:
-- 1.6.4
+- 1.6.5
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -55,11 +55,16 @@ pin_run_as_build:
 python:
 - 3.7.* *_cpython
 re2:
-- 2020.08.01
+- 2020.10.01
 snappy:
 - '1'
 target_platform:
 - linux-aarch64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - numpy
+  - python
 zlib:
 - '1.2'
 zstd:

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.8.____cpython.yaml
@@ -1,15 +1,15 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aws_sdk_cpp:
-- 1.8.54
+- 1.8.63
 boost_cpp:
 - 1.74.0
 bzip2:
 - '1'
 c_compiler:
 - gcc
 c_compiler_version:
-- '7.5'
+- '7'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -23,23 +23,23 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7.5'
+- '7'
 docker_image:
 - condaforge/linux-anvil-aarch64
 gflags:
 - '2.2'
 glog:
 - 0.4.0
 grpc_cpp:
-- '1.30'
+- '1.32'
 libprotobuf:
 - '3.13'
 lz4_c:
 - 1.9.2
 numpy:
 - '1.16'
 orc:
-- 1.6.4
+- 1.6.5
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -55,11 +55,16 @@ pin_run_as_build:
 python:
 - 3.8.* *_cpython
 re2:
-- 2020.08.01
+- 2020.10.01
 snappy:
 - '1'
 target_platform:
 - linux-aarch64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - numpy
+  - python
 zlib:
 - '1.2'
 zstd:

diff --git a/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_aarch64_python3.9.____cpython.yaml
@@ -0,0 +1,71 @@
+BUILD:
+- aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.8.63
+boost_cpp:
+- 1.74.0
+bzip2:
+- '1'
+c_compiler:
+- gcc
+c_compiler_version:
+- '7'
+cdt_arch:
+- aarch64
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cuda_compiler_version:
+- None
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '7'
+docker_image:
+- condaforge/linux-anvil-aarch64
+gflags:
+- '2.2'
+glog:
+- 0.4.0
+grpc_cpp:
+- '1.32'
+libprotobuf:
+- '3.13'
+lz4_c:
+- 1.9.2
+numpy:
+- '1.19'
+orc:
+- 1.6.5
+pin_run_as_build:
+  boost-cpp:
+    max_pin: x.x.x
+  bzip2:
+    max_pin: x
+  lz4-c:
+    max_pin: x.x.x
+  python:
+    min_pin: x.x
+    max_pin: x.x
+  zlib:
+    max_pin: x.x
+python:
+- 3.9.* *_cpython
+re2:
+- 2020.10.01
+snappy:
+- '1'
+target_platform:
+- linux-aarch64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - numpy
+  - python
+zlib:
+- '1.2'
+zstd:
+- '1.4'
diff --git a/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/linux_cuda_compiler_version9.2python3.6.____cpython.yaml
@@ -1,5 +1,5 @@
 aws_sdk_cpp:
-- 1.8.54
+- 1.8.63
 boost_cpp:
 - 1.74.0
 bzip2:
@@ -27,15 +27,15 @@ gflags:
 glog:
 - 0.4.0
 grpc_cpp:
-- '1.30'
+- '1.32'
 libprotobuf:
 - '3.13'
 lz4_c:
 - 1.9.2
 numpy:
 - '1.16'
 orc:
-- 1.6.4
+- 1.6.5
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -51,14 +51,18 @@ pin_run_as_build:
 python:
 - 3.6.* *_cpython
 re2:
-- 2020.08.01
+- 2020.10.01
 snappy:
 - '1'
 target_platform:
 - linux-64
 zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 - - cuda_compiler_version
   - docker_image
+- - numpy
+  - python
 zlib:
 - '1.2'
 zstd: