GH-35460: Fix CI workflows

Author: Reranko05

ci/conda_env_cpp.txt

@@ -45,6 +45,7 @@ pkg-config
 python
 rapidjson
 re2
+simdjson
 snappy
 thrift-cpp>=0.11.0
 xsimd>=14.2

ci/scripts/PKGBUILD

@@ -137,6 +137,7 @@ build() {
     -DARROW_CXXFLAGS="${CPPFLAGS}" \
     -DAWSSDK_SOURCE=BUNDLED \
     -DCMAKE_BUILD_TYPE="release" \
+    -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_UNITY_BUILD=OFF \
     -DCMAKE_VERBOSE_MAKEFILE=ON \

ci/vcpkg/vcpkg.json

@@ -57,12 +57,7 @@
     "json": {
       "description": "JSON support",
       "dependencies": [
-        "rapidjson"
-      ]
-    },
-    "simdjson": {
-      "description": "Optimized SIMD JSON parsing support",
-      "dependencies": [
+        "rapidjson",
         "simdjson"
       ]
     },

cpp/cmake_modules/FindsimdjsonAlt.cmake

@@ -19,8 +19,6 @@ if(SimdjsonAlt_FOUND)
   return()
 endif()
 
-# Try to find simdjson manually first, as some system packages have broken
-# CMake configs that reference non-existent library files (e.g., Alpine Linux)
 if(simdjson_ROOT)
   find_path(SIMDJSON_INCLUDE_DIR
             NAMES simdjson.h

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -138,10 +138,6 @@ if(ARROW_DEPENDENCY_SOURCE STREQUAL "CONDA")
   if("${GTest_SOURCE}" STREQUAL "")
     set(GTest_SOURCE "AUTO")
   endif()
-  # simdjson is not commonly available in conda, so we allow auto fallback.
-  if("${simdjson_SOURCE}" STREQUAL "")
-    set(simdjson_SOURCE "AUTO")
-  endif()
   message(STATUS "Using CONDA_PREFIX for ARROW_PACKAGE_PREFIX: ${ARROW_PACKAGE_PREFIX}")
 else()
   set(ARROW_ACTUAL_DEPENDENCY_SOURCE "${ARROW_DEPENDENCY_SOURCE}")
@@ -2801,49 +2797,30 @@ if(ARROW_BUILD_BENCHMARKS)
                      FALSE)
 endif()
 
-macro(build_simdjson)
+function(build_simdjson)
+  list(APPEND CMAKE_MESSAGE_INDENT "simdjson: ")
   message(STATUS "Building simdjson from source")
-  set(SIMDJSON_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/simdjson_ep/src/simdjson_ep-install")
-  set(SIMDJSON_INCLUDE_DIR "${SIMDJSON_PREFIX}/include")
-  set(SIMDJSON_LIB_DIR "${SIMDJSON_PREFIX}/lib")
 
-  set(SIMDJSON_CMAKE_ARGS
-      ${EP_COMMON_CMAKE_ARGS}
-      -DSIMDJSON_BUILD_STATIC_LIB=ON
-      -DSIMDJSON_DEVELOPER_MODE=OFF
-      -DSIMDJSON_ENABLE_THREADS=ON
-      -DBUILD_SHARED_LIBS=OFF
-      "-DCMAKE_INSTALL_PREFIX=${SIMDJSON_PREFIX}")
-
-  set(SIMDJSON_STATIC_LIB
-      "${SIMDJSON_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}simdjson${CMAKE_STATIC_LIBRARY_SUFFIX}"
-  )
-
-  externalproject_add(simdjson_ep
-                      ${EP_COMMON_OPTIONS}
-                      PREFIX "${CMAKE_BINARY_DIR}"
-                      URL ${SIMDJSON_SOURCE_URL}
-                      URL_HASH "SHA256=${ARROW_SIMDJSON_BUILD_SHA256_CHECKSUM}"
-                      CMAKE_ARGS ${SIMDJSON_CMAKE_ARGS}
-                      BUILD_BYPRODUCTS "${SIMDJSON_STATIC_LIB}")
+  prepare_fetchcontent()
 
-  # The include directory must exist before it is referenced by a target.
-  file(MAKE_DIRECTORY "${SIMDJSON_INCLUDE_DIR}")
+  fetchcontent_declare(simdjson
+                       ${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
+                       URL ${SIMDJSON_SOURCE_URL}
+                       URL_HASH "SHA256=${ARROW_SIMDJSON_BUILD_SHA256_CHECKSUM}")
 
-  # Check if target already exists (may have been created by find_package with incompatible version)
-  if(NOT TARGET simdjson::simdjson)
-    add_library(simdjson::simdjson STATIC IMPORTED)
-  endif()
-  set_target_properties(simdjson::simdjson
-                        PROPERTIES IMPORTED_LOCATION "${SIMDJSON_STATIC_LIB}"
-                                   INTERFACE_INCLUDE_DIRECTORIES
-                                   "${SIMDJSON_INCLUDE_DIR}")
-  add_dependencies(simdjson::simdjson simdjson_ep)
+  fetchcontent_makeavailable(simdjson)
 
-  set(SIMDJSON_VENDORED TRUE)
+  set(SIMDJSON_VENDORED
+      TRUE
+      PARENT_SCOPE)
 
   list(APPEND ARROW_BUNDLED_STATIC_LIBS simdjson::simdjson)
-endmacro()
+  set(ARROW_BUNDLED_STATIC_LIBS
+      "${ARROW_BUNDLED_STATIC_LIBS}"
+      PARENT_SCOPE)
+
+  list(POP_BACK CMAKE_MESSAGE_INDENT)
+endfunction()
 
 if(ARROW_WITH_SIMDJSON)
   set(ARROW_SIMDJSON_REQUIRED_VERSION "3.0.0")

cpp/src/arrow/json/object_parser.cc

@@ -34,7 +34,7 @@ class ObjectParser::Impl {
 
     // Handle parse errors
     if (result.error()) {
-      return Status::Invalid("Json parse error: ",
+      return Status::Invalid("JSON parse error: ",
                              simdjson::error_message(result.error()));
     }
 
@@ -43,7 +43,7 @@ class ObjectParser::Impl {
 
     // Validate root is an object
     if (!document_.is_object()) {
-      return Status::TypeError("Not a json object");
+      return Status::TypeError("Not a JSON object");
     }
 
     return Status::OK();

cpp/vcpkg.json

@@ -48,6 +48,7 @@
     "protobuf",
     "rapidjson",
     "re2",
+    "simdjson",
     "snappy",
     "sqlite3",
     "thrift",