Merge branch 'main' into GH-47996_Update_AWS_SDK_Version_1.11.691

Author: Morgan Killik

.pre-commit-config.yaml

@@ -341,6 +341,7 @@ repos:
           ?^ci/scripts/release_test\.sh$|
           ?^ci/scripts/ruby_test\.sh$|
           ?^ci/scripts/rust_build\.sh$|
+          ?^ci/scripts/util_download_apache\.sh$|
           ?^ci/scripts/util_enable_core_dumps\.sh$|
           ?^ci/scripts/util_free_space\.sh$|
           ?^ci/scripts/util_log\.sh$|

LICENSE.txt

@@ -455,30 +455,6 @@ limitations under the License.
 
 --------------------------------------------------------------------------------
 
-The script ci/scripts/util_wait_for_it.sh has the following license
-
-Copyright (c) 2016 Giles Hall
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---------------------------------------------------------------------------------
-
 The script r/configure has the following license (MIT)
 
 Copyright (c) 2017, Jeroen Ooms and Jim Hester

ci/scripts/util_download_apache.sh

@@ -44,10 +44,9 @@ APACHE_MIRRORS=(
 
 mkdir -p "${target_dir}"
 
-for mirror in ${APACHE_MIRRORS[*]}
+for mirror in "${APACHE_MIRRORS[@]}"
 do
-  curl -SL "${mirror}/${tarball_path}" | tar -xzf - -C "${target_dir}"
-  if [ $? == 0 ]; then
+  if curl -SL "${mirror}/${tarball_path}" | tar -xzf - -C "${target_dir}"; then
     exit 0
   fi
 done

ci/scripts/util_wait_for_it.sh

@@ -2799,37 +2799,66 @@ if(ARROW_WITH_ZSTD)
 endif()
 
 # ----------------------------------------------------------------------
-# RE2 (required for Gandiva)
+# RE2 (required for Gandiva and gRPC)
 
-macro(build_re2)
-  message(STATUS "Building RE2 from source")
-  set(RE2_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/re2_ep-install")
-  set(RE2_STATIC_LIB
-      "${RE2_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}re2${CMAKE_STATIC_LIBRARY_SUFFIX}")
+function(build_re2)
+  list(APPEND CMAKE_MESSAGE_INDENT "RE2: ")
+  message(STATUS "Building RE2 from source using FetchContent")
+  set(RE2_VENDORED
+      TRUE
+      PARENT_SCOPE)
+  set(RE2_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/re2_fc-install")
+  set(RE2_PREFIX
+      "${RE2_PREFIX}"
+      PARENT_SCOPE)
 
-  set(RE2_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${RE2_PREFIX}")
+  fetchcontent_declare(re2
+                       URL ${RE2_SOURCE_URL}
+                       URL_HASH "SHA256=${ARROW_RE2_BUILD_SHA256_CHECKSUM}")
+  prepare_fetchcontent()
 
-  externalproject_add(re2_ep
-                      ${EP_COMMON_OPTIONS}
-                      INSTALL_DIR ${RE2_PREFIX}
-                      URL ${RE2_SOURCE_URL}
-                      URL_HASH "SHA256=${ARROW_RE2_BUILD_SHA256_CHECKSUM}"
-                      CMAKE_ARGS ${RE2_CMAKE_ARGS}
-                      BUILD_BYPRODUCTS "${RE2_STATIC_LIB}")
-
-  file(MAKE_DIRECTORY "${RE2_PREFIX}/include")
-  add_library(re2::re2 STATIC IMPORTED)
-  set_target_properties(re2::re2 PROPERTIES IMPORTED_LOCATION "${RE2_STATIC_LIB}")
-  target_include_directories(re2::re2 BEFORE INTERFACE "${RE2_PREFIX}/include")
-
-  add_dependencies(re2::re2 re2_ep)
-  set(RE2_VENDORED TRUE)
-  # Set values so that FindRE2 finds this too
-  set(RE2_LIB ${RE2_STATIC_LIB})
-  set(RE2_INCLUDE_DIR "${RE2_PREFIX}/include")
-
-  list(APPEND ARROW_BUNDLED_STATIC_LIBS re2::re2)
-endmacro()
+  # Unity build causes some build errors
+  set(CMAKE_UNITY_BUILD OFF)
+  fetchcontent_makeavailable(re2)
+
+  # This custom target ensures re2 is built before we install
+  add_custom_target(re2_built DEPENDS re2::re2)
+
+  add_custom_command(OUTPUT "${re2_BINARY_DIR}/cmake_install.cmake.saved"
+                     COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                             "${re2_BINARY_DIR}/cmake_install.cmake"
+                             "${re2_BINARY_DIR}/cmake_install.cmake.saved"
+                     COMMAND ${CMAKE_COMMAND} -E echo
+                             "# RE2 install disabled to prevent double installation with Arrow"
+                             > "${re2_BINARY_DIR}/cmake_install.cmake"
+                     DEPENDS re2_built
+                     COMMENT "Disabling RE2 install to prevent double installation"
+                     VERBATIM)
+
+  add_custom_target(re2_install_disabled ALL
+                    DEPENDS "${re2_BINARY_DIR}/cmake_install.cmake.saved")
+
+  # Install RE2 to RE2_PREFIX for gRPC to find
+  add_custom_command(OUTPUT "${RE2_PREFIX}/.re2_installed"
+                     COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                             "${re2_BINARY_DIR}/cmake_install.cmake.saved"
+                             "${re2_BINARY_DIR}/cmake_install.cmake.tmp"
+                     COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${RE2_PREFIX}
+                             -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P
+                             "${re2_BINARY_DIR}/cmake_install.cmake.tmp" ||
+                             ${CMAKE_COMMAND} -E true
+                     COMMAND ${CMAKE_COMMAND} -E touch "${RE2_PREFIX}/.re2_installed"
+                     DEPENDS re2_install_disabled
+                     COMMENT "Installing RE2 to ${RE2_PREFIX} for gRPC"
+                     VERBATIM)
+
+  add_custom_target(re2_fc DEPENDS "${RE2_PREFIX}/.re2_installed")
+
+  set(ARROW_BUNDLED_STATIC_LIBS
+      ${ARROW_BUNDLED_STATIC_LIBS} re2::re2
+      PARENT_SCOPE)
+  list(POP_BACK CMAKE_MESSAGE_INDENT)
+endfunction()
 
 if(ARROW_WITH_RE2)
   resolve_dependency(re2
@@ -3234,7 +3263,7 @@ macro(build_grpc)
   endif()
 
   if(RE2_VENDORED)
-    add_dependencies(grpc_dependencies re2_ep)
+    add_dependencies(grpc_dependencies re2_fc)
   endif()
 
   add_dependencies(grpc_dependencies ${ARROW_PROTOBUF_LIBPROTOBUF} c-ares::cares
@@ -3255,8 +3284,13 @@ macro(build_grpc)
     get_filename_component(GRPC_CARES_ROOT "${GRPC_CARES_INCLUDE_DIR}" DIRECTORY)
   endif()
 
-  get_target_property(GRPC_RE2_INCLUDE_DIR re2::re2 INTERFACE_INCLUDE_DIRECTORIES)
-  get_filename_component(GRPC_RE2_ROOT "${GRPC_RE2_INCLUDE_DIR}" DIRECTORY)
+  # For FetchContent RE2, use the install prefix directly
+  if(RE2_VENDORED)
+    set(GRPC_RE2_ROOT "${RE2_PREFIX}")
+  else()
+    get_target_property(GRPC_RE2_INCLUDE_DIR re2::re2 INTERFACE_INCLUDE_DIRECTORIES)
+    get_filename_component(GRPC_RE2_ROOT "${GRPC_RE2_INCLUDE_DIR}" DIRECTORY)
+  endif()
 
   # Put Abseil, etc. first so that local directories are searched
   # before (what are likely) system directories

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -118,9 +118,9 @@ arrow::Status WriteFullFile(std::string path_to_file) {
   std::shared_ptr<arrow::io::FileOutputStream> outfile;
   ARROW_ASSIGN_OR_RAISE(outfile, arrow::io::FileOutputStream::Open(path_to_file));
 
-  ARROW_RETURN_NOT_OK(parquet::arrow::WriteTable(*table.get(),
-                                                 arrow::default_memory_pool(), outfile,
-                                                 /*chunk_size=*/64*1024, props, arrow_props));
+  ARROW_RETURN_NOT_OK(
+      parquet::arrow::WriteTable(*table.get(), arrow::default_memory_pool(), outfile,
+                                 /*chunk_size=*/64 * 1024, props, arrow_props));
   return arrow::Status::OK();
 }
 

cpp/examples/arrow/parquet_read_write.cc

@@ -22,7 +22,7 @@ project(
     version: '23.0.0-SNAPSHOT',
     license: 'Apache-2.0',
     meson_version: '>=1.3.0',
-    default_options: ['c_std=gnu11,c11', 'warning_level=2', 'cpp_std=c++17'],
+    default_options: ['c_std=c11', 'warning_level=2', 'cpp_std=c++17'],
 )
 
 project_args = [