Switch the cpp to 21.0.00

Author: nguyenminhtien1411

cpp/CMakeLists.txt

@@ -61,11 +61,6 @@ cmake_policy(SET CMP0074 NEW)
 # option() honors normal variables.
 cmake_policy(SET CMP0077 NEW)
 
-# https://cmake.org/cmake/help/latest/policy/CMP0090.html
-#
-# export(PACKAGE) does nothing by default.
-cmake_policy(SET CMP0090 NEW)
-
 # https://cmake.org/cmake/help/latest/policy/CMP0091.html
 #
 # MSVC runtime library flags are selected by an abstraction.
@@ -96,7 +91,7 @@ if(POLICY CMP0170)
   cmake_policy(SET CMP0170 NEW)
 endif()
 
-set(ARROW_VERSION "22.0.0-SNAPSHOT")
+set(ARROW_VERSION "21.0.0")
 
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")
 
@@ -706,6 +701,10 @@ if(ARROW_GANDIVA)
   add_subdirectory(src/gandiva)
 endif()
 
+if(ARROW_SKYHOOK)
+  add_subdirectory(src/skyhook)
+endif()
+
 if(ARROW_BUILD_EXAMPLES)
   add_custom_target(runexample ctest -L example)
   add_subdirectory(examples/arrow)

cpp/CMakePresets.json

@@ -179,6 +179,7 @@
         "ARROW_BUILD_EXAMPLES": "ON",
         "ARROW_BUILD_UTILITIES": "ON",
         "ARROW_FLIGHT_SQL_ODBC": "ON",
+        "ARROW_SKYHOOK": "ON",
         "ARROW_TENSORFLOW": "ON",
         "PARQUET_BUILD_EXAMPLES": "ON",
         "PARQUET_BUILD_EXECUTABLES": "ON"
@@ -581,34 +582,6 @@
       ],
       "displayName": "Benchmarking build with everything enabled",
       "cacheVariables": {}
-    },
-    {
-      "name": "ninja-release-jni-macos",
-      "inherits": [
-        "base-release"
-      ],
-      "displayName": "Build for JNI on macOS",
-      "cacheVariables": {
-        "ARROW_ACERO": "ON",
-        "ARROW_BUILD_SHARED": "OFF",
-        "ARROW_BUILD_STATIC": "ON",
-        "ARROW_CSV": "ON",
-        "ARROW_DATASET": "ON",
-        "ARROW_DEPENDENCY_USE_SHARED": "OFF",
-        "ARROW_GANDIVA": "ON",
-        "ARROW_GANDIVA_STATIC_LIBSTDCPP": "ON",
-        "ARROW_JSON": "ON",
-        "ARROW_ORC": "ON",
-        "ARROW_PARQUET": "ON",
-        "ARROW_S3": "ON",
-        "ARROW_SUBSTRAIT": "ON",
-        "AWSSDK_SOURCE": "BUNDLED",
-        "GTest_SOURCE": "BUNDLED",
-        "PARQUET_BUILD_EXAMPLES": "OFF",
-        "PARQUET_BUILD_EXECUTABLES": "OFF",
-        "PARQUET_REQUIRE_ENCRYPTION": "OFF",
-        "re2_SOURCE": "BUNDLED"
-      }
     }
   ]
 }

cpp/build-support/run-test.sh

@@ -77,7 +77,6 @@ function setup_sanitizers() {
 
   # Set up suppressions for AddressSanitizer
   ASAN_OPTIONS="$ASAN_OPTIONS suppressions=$ROOT/build-support/asan-suppressions.txt"
-  ASAN_OPTIONS="$ASAN_OPTIONS allocator_may_return_null=1"
   export ASAN_OPTIONS
 
   # Set up suppressions for LeakSanitizer

cpp/build-support/update-flatbuffers.sh

@@ -34,3 +34,7 @@ FILES=($(find $FORMAT_DIR -name '*.fbs'))
 FILES+=("$SOURCE_DIR/arrow/ipc/feather.fbs")
 
 $FLATC -o "$OUT_DIR" "${FILES[@]}"
+
+# Skyhook flatbuffers
+$FLATC -o "$SOURCE_DIR/skyhook/protocol" \
+  "$SOURCE_DIR/skyhook/protocol/ScanRequest.fbs"

cpp/cmake_modules/BuildUtils.cmake

@@ -265,7 +265,6 @@ function(ADD_ARROW_LIB LIB_NAME)
     if(ARG_DEFINITIONS)
       target_compile_definitions(${LIB_NAME}_objlib PRIVATE ${ARG_DEFINITIONS})
     endif()
-    target_compile_options(${LIB_NAME}_objlib PRIVATE ${ARROW_LIBRARIES_ONLY_CXX_FLAGS})
     set(LIB_DEPS $<TARGET_OBJECTS:${LIB_NAME}_objlib>)
     set(EXTRA_DEPS)
 
@@ -327,7 +326,6 @@ function(ADD_ARROW_LIB LIB_NAME)
     if(ARG_DEFINITIONS)
       target_compile_definitions(${LIB_NAME}_shared PRIVATE ${ARG_DEFINITIONS})
     endif()
-    target_compile_options(${LIB_NAME}_shared PRIVATE ${ARROW_LIBRARIES_ONLY_CXX_FLAGS})
 
     if(ARG_OUTPUTS)
       list(APPEND ${ARG_OUTPUTS} ${LIB_NAME}_shared)
@@ -418,7 +416,6 @@ function(ADD_ARROW_LIB LIB_NAME)
     if(ARG_DEFINITIONS)
       target_compile_definitions(${LIB_NAME}_static PRIVATE ${ARG_DEFINITIONS})
     endif()
-    target_compile_options(${LIB_NAME}_static PRIVATE ${ARROW_LIBRARIES_ONLY_CXX_FLAGS})
 
     if(ARG_OUTPUTS)
       list(APPEND ${ARG_OUTPUTS} ${LIB_NAME}_static)

cpp/cmake_modules/DefineOptions.cmake

@@ -407,6 +407,15 @@ takes precedence over ccache if a storage backend is configured" ON)
                 DEPENDS
                 ARROW_S3)
 
+  define_option(ARROW_SKYHOOK
+                "Build the Skyhook libraries"
+                OFF
+                DEPENDS
+                ARROW_DATASET
+                ARROW_PARQUET
+                ARROW_WITH_LZ4
+                ARROW_WITH_SNAPPY)
+
   define_option(ARROW_SUBSTRAIT
                 "Build the Arrow Substrait Consumer Module"
                 OFF

cpp/cmake_modules/SetupCxxFlags.cmake

@@ -49,11 +49,7 @@ endif()
 if(ARROW_CPU_FLAG STREQUAL "x86")
   # x86/amd64 compiler flags, msvc/gcc/clang
   if(MSVC)
-    set(ARROW_SSE4_2_FLAG "/arch:SSE4.2")
-    # These definitions are needed for xsimd to consider the corresponding instruction
-    # sets available, but they are not set by MSVC (unlike other compilers).
-    # See https://github.com/AcademySoftwareFoundation/OpenImageIO/issues/4265
-    add_definitions(-D__SSE2__ -D__SSE4_1__ -D__SSE4_2__)
+    set(ARROW_SSE4_2_FLAG "")
     set(ARROW_AVX2_FLAG "/arch:AVX2")
     # MSVC has no specific flag for BMI2, it seems to be enabled with AVX2
     set(ARROW_BMI2_FLAG "/arch:AVX2")
@@ -159,9 +155,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ${ARROW_POSITION_INDEPENDENT_CODE})
 set(UNKNOWN_COMPILER_MESSAGE
     "Unknown compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
-# Compiler flags used when building Arrow libraries (but not tests, utilities, etc.)
-set(ARROW_LIBRARIES_ONLY_CXX_FLAGS)
-
 # compiler flags that are common across debug/release builds
 if(WIN32)
   # TODO(wesm): Change usages of C runtime functions that MSVC says are
@@ -325,9 +318,6 @@ if("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wimplicit-fallthrough")
     string(APPEND CXX_ONLY_FLAGS " -Wredundant-move")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wunused-result")
-    # Flag non-static functions that don't have corresponding declaration in a .h file.
-    # Only for Arrow libraries, since this is not a problem in tests or utilities.
-    list(APPEND ARROW_LIBRARIES_ONLY_CXX_FLAGS "-Wmissing-declarations")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR CMAKE_CXX_COMPILER_ID STREQUAL
                                                    "IntelLLVM")
     if(WIN32)

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -1016,8 +1016,7 @@ macro(prepare_fetchcontent)
   set(BUILD_TESTING OFF)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "")
   set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
-  set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY ON)
-  set(CMAKE_EXPORT_PACKAGE_REGISTRY OFF)
+  set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY OFF)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "")
   set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
   # We set CMAKE_POLICY_VERSION_MINIMUM temporarily due to failures with CMake 4
@@ -1739,29 +1738,8 @@ function(build_thrift)
   if(CMAKE_VERSION VERSION_LESS 3.26)
     message(FATAL_ERROR "Require CMake 3.26 or later for building bundled Apache Thrift")
   endif()
-  set(THRIFT_PATCH_COMMAND)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    find_program(PATCH patch)
-    if(PATCH)
-      list(APPEND
-           THRIFT_PATCH_COMMAND
-           ${PATCH}
-           -p1
-           -i)
-    else()
-      find_program(GIT git)
-      if(GIT)
-        list(APPEND THRIFT_PATCH_COMMAND ${GIT} apply)
-      endif()
-    endif()
-    if(THRIFT_PATCH_COMMAND)
-      # https://github.com/apache/thrift/pull/3187
-      list(APPEND THRIFT_PATCH_COMMAND ${CMAKE_CURRENT_LIST_DIR}/thrift-3187.patch)
-    endif()
-  endif()
   fetchcontent_declare(thrift
                        ${FC_DECLARE_COMMON_OPTIONS}
-                       PATCH_COMMAND ${THRIFT_PATCH_COMMAND}
                        URL ${THRIFT_SOURCE_URL}
                        URL_HASH "SHA256=${ARROW_THRIFT_BUILD_SHA256_CHECKSUM}")
 
@@ -1788,10 +1766,6 @@ function(build_thrift)
   set(WITH_QT5 OFF)
   set(WITH_ZLIB OFF)
 
-  # Apache Thrift may change CMAKE_DEBUG_POSTFIX. So we'll restore the
-  # original CMAKE_DEBUG_POSTFIX later.
-  set(CMAKE_DEBUG_POSTFIX_KEEP ${CMAKE_DEBUG_POSTFIX})
-
   # Remove Apache Arrow's CMAKE_MODULE_PATH to ensure using Apache
   # Thrift's cmake_modules/.
   #
@@ -1800,12 +1774,6 @@ function(build_thrift)
   list(POP_FRONT CMAKE_MODULE_PATH)
   fetchcontent_makeavailable(thrift)
 
-  # Apache Thrift may change CMAKE_DEBUG_POSTFIX. So we restore
-  # CMAKE_DEBUG_POSTFIX.
-  set(CMAKE_DEBUG_POSTFIX
-      ${CMAKE_DEBUG_POSTFIX_KEEP}
-      CACHE BOOL "" FORCE)
-
   if(CMAKE_VERSION VERSION_LESS 3.28)
     set_property(DIRECTORY ${thrift_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL TRUE)
   endif()
@@ -2580,7 +2548,7 @@ if(ARROW_USE_XSIMD)
                      IS_RUNTIME_DEPENDENCY
                      FALSE
                      REQUIRED_VERSION
-                     "13.0.0")
+                     "8.1.0")
 
   if(xsimd_SOURCE STREQUAL "BUNDLED")
     set(ARROW_XSIMD arrow::xsimd)
@@ -5055,8 +5023,6 @@ endif()
 # AWS SDK for C++
 
 function(build_awssdk)
-  list(APPEND CMAKE_MESSAGE_INDENT "AWS SDK for C++: ")
-
   message(STATUS "Building AWS SDK for C++ from source")
 
   # aws-c-common must be the first product because others depend on
@@ -5090,8 +5056,14 @@ function(build_awssdk)
     # AWS-C-CAL ->
     # AWS_C_CAL
     string(REGEX REPLACE "-" "_" BASE_VARIABLE_NAME "${BASE_VARIABLE_NAME}")
+    if(MINGW AND AWSSDK_PRODUCT STREQUAL "aws-c-common")
+      find_program(PATCH patch REQUIRED)
+      set(${BASE_VARIABLE_NAME}_PATCH_COMMAND
+          ${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/aws-c-common-1208.patch)
+    endif()
     fetchcontent_declare(${AWSSDK_PRODUCT}
                          ${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
+                         PATCH_COMMAND ${${BASE_VARIABLE_NAME}_PATCH_COMMAND}
                          URL ${${BASE_VARIABLE_NAME}_SOURCE_URL}
                          URL_HASH "SHA256=${ARROW_${BASE_VARIABLE_NAME}_BUILD_SHA256_CHECKSUM}"
     )
@@ -5161,9 +5133,9 @@ function(build_awssdk)
 
   # For aws-sdk-cpp
   #
-  # We need to use CACHE variables because aws-sdk-cpp < 1.12.0 uses
+  # We need to use CACHE variables because aws-sdk-cpp < 12.0.0 uses
   # CMP0077 OLD policy. We can use normal variables when we use
-  # aws-sdk-cpp >= 1.12.0.
+  # aws-sdk-cpp >= 12.0.0.
   set(AWS_SDK_WARNINGS_ARE_ERRORS
       OFF
       CACHE BOOL "" FORCE)
@@ -5188,15 +5160,12 @@ function(build_awssdk)
       OFF
       CACHE BOOL "" FORCE)
   if(NOT WIN32)
-    if(ZLIB_VENDORED)
-      # Use vendored zlib.
-      set(ZLIB_INCLUDE_DIR
-          "$<TARGET_PROPERTY:ZLIB::ZLIB,INTERFACE_INCLUDE_DIRECTORIES>"
-          CACHE STRING "" FORCE)
-      set(ZLIB_LIBRARY
-          "$<TARGET_FILE:ZLIB::ZLIB>"
-          CACHE STRING "" FORCE)
-    endif()
+    set(ZLIB_INCLUDE_DIR
+        "$<TARGET_PROPERTY:ZLIB::ZLIB,INTERFACE_INCLUDE_DIRECTORIES>"
+        CACHE STRING "" FORCE)
+    set(ZLIB_LIBRARY
+        "$<TARGET_FILE:ZLIB::ZLIB>"
+        CACHE STRING "" FORCE)
   endif()
   if(MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9")
     # This is for RTools 40. We can remove this after we dropped
@@ -5263,15 +5232,9 @@ function(build_awssdk)
   set(AWSSDK_LINK_LIBRARIES
       ${AWSSDK_LINK_LIBRARIES}
       PARENT_SCOPE)
-
-  list(POP_BACK CMAKE_MESSAGE_INDENT)
 endfunction()
 
 if(ARROW_S3)
-  if(NOT WIN32)
-    # This is for adding system curl dependency.
-    find_curl()
-  endif()
   # Keep this in sync with s3fs.cc
   resolve_dependency(AWSSDK
                      HAVE_ALT

cpp/cmake_modules/aws-c-common-1208.patch

@@ -0,0 +1,83 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+From 06c435c6765833734c62ac45909b5ab1fc5276a7 Mon Sep 17 00:00:00 2001
+From: Sutou Kouhei <kou@clear-code.com>
+Date: Sat, 7 Jun 2025 20:40:36 +0900
+Subject: [PATCH] Use _WIN32 not _MSC_VER for MinGW
+
+This was missed in https://github.com/awslabs/aws-c-common/pull/801
+and https://github.com/awslabs/aws-c-common/pull/822 .
+
+MSYS2 also includes this change:
+https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-aws-c-common/001-fix-build-on-mingw-aarch64.patch
+
+Error message without this:
+
+https://github.com/ursacomputing/crossbow/actions/runs/15502494926/job/43652596580#step:7:5884
+
+     cd /D/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-build && /D/a/crossbow/crossbow/sccache/sccache.exe /C/rtools40/mingw32/bin/cc.exe -DARROW_HAVE_RUNTIME_SSE4_2 -DARROW_HAVE_SSE4_2 -DARROW_WITH_TIMING_TESTS -DAWS_AFFINITY_METHOD=AWS_AFFINITY_METHOD_NONE -DCJSON_HIDE_SYMBOLS -DINTEL_NO_ITTNOTIFY_API -DPSAPI_VERSION=1 -DWINDOWS_KERNEL_LIB=kernel32 -D_CRT_SECURE_NO_WARNINGS @CMakeFiles/aws-c-common.dir/includes_C.rsp -O3 -DNDEBUG -O2 -ftree-vectorize  -std=gnu99 -fvisibility=hidden -Wall -Wstrict-prototypes -pedantic -Wno-long-long -fPIC -D_FILE_OFFSET_BITS=64 -MD -MT _deps/aws-c-common-build/CMakeFiles/aws-c-common.dir/source/allocator.c.obj -MF CMakeFiles/aws-c-common.dir/source/allocator.c.obj.d -o CMakeFiles/aws-c-common.dir/source/allocator.c.obj -c /D/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c
+    In file included from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.h:71,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_buf.h:9,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/thread.h:8,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/logging.h:11,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c:8:
+    D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.inl: In function 'aws_hton64':
+    D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.inl:47:23: warning: implicit declaration of function 'htonl'; did you mean 'wtoll'? [-Wimplicit-function-declaration]
+         return ((uint64_t)htonl(low)) << 32 | htonl(high);
+                           ^~~~~
+                           wtoll
+    In file included from C:/rtools40/mingw32/i686-w64-mingw32/include/windows.h:92,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c:15:
+    C:/rtools40/mingw32/i686-w64-mingw32/include/winsock.h: At top level:
+    C:/rtools40/mingw32/i686-w64-mingw32/include/winsock.h:286:37: error: conflicting types for 'htonl'
+       WINSOCK_API_LINKAGE u_long WSAAPI htonl(u_long hostlong);
+                                         ^~~~~
+    In file included from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.h:71,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_buf.h:9,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/thread.h:8,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/logging.h:11,
+                     from D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/source/allocator.c:8:
+    D:/a/crossbow/crossbow/src/build-i686-cpp/_deps/aws-c-common-src/include/aws/common/byte_order.inl:47:23: note: previous implicit declaration of 'htonl' was here
+         return ((uint64_t)htonl(low)) << 32 | htonl(high);
+                           ^~~~~
+---
+ include/aws/common/byte_order.inl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/aws/common/byte_order.inl b/include/aws/common/byte_order.inl
+index 1204be06a1..0abd9cb8cd 100644
+--- a/include/aws/common/byte_order.inl
++++ b/include/aws/common/byte_order.inl
+@@ -13,7 +13,7 @@
+ #    include <stdlib.h>
+ #else
+ #    include <netinet/in.h>
+-#endif /* _MSC_VER */
++#endif /* _WIN32 */
+ 
+ AWS_EXTERN_C_BEGIN
+ 
+@@ -39,7 +39,7 @@ AWS_STATIC_IMPL uint64_t aws_hton64(uint64_t x) {
+     uint64_t v;
+     __asm__("bswap %q0" : "=r"(v) : "0"(x));
+     return v;
+-#elif defined(_MSC_VER)
++#elif defined(_WIN32)
+     return _byteswap_uint64(x);
+ #else
+     uint32_t low = x & UINT32_MAX;