[arrow] branch master updated: ARROW-16794: [CI][C++][MinGW] Make CI jobs more stable (#13359)

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 461b3b9ac6 ARROW-16794: [CI][C++][MinGW] Make CI jobs more stable (#13359)
461b3b9ac6 is described below

commit 461b3b9ac61df41e74b09a7c75b207e633eee81a
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Wed Jun 22 16:04:48 2022 +0900

    ARROW-16794: [CI][C++][MinGW] Make CI jobs more stable (#13359)
    
    This pull request includes the followings:
    
    * Build error fixes on debug build
      * Debug build was tried but it's slower than release build
      * So we don't change build type in this pull request
    * Increase timeout to make MinGW related CI jobs buildable without cache
      * 60 minutes are short for MinGW related CI jobs without cache
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 .github/workflows/cpp.yml     | 2 +-
 .github/workflows/ruby.yml    | 2 +-
 ci/scripts/msys2_setup.sh     | 1 +
 cpp/src/arrow/io/hdfs_test.cc | 7 +++++--
 cpp/src/arrow/util/io_util.cc | 3 +--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 529461d924..b914b7df52 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -261,7 +261,7 @@ jobs:
     name: AMD64 Windows MinGW ${{ matrix.mingw-n-bits }} C++
     runs-on: windows-2019
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 1641751f41..a35a9e02a8 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -178,7 +178,7 @@ jobs:
     name: AMD64 Windows MinGW ${{ matrix.mingw-n-bits }} GLib & Ruby
     runs-on: windows-2019
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:
diff --git a/ci/scripts/msys2_setup.sh b/ci/scripts/msys2_setup.sh
index d7e39450b4..ed96350514 100755
--- a/ci/scripts/msys2_setup.sh
+++ b/ci/scripts/msys2_setup.sh
@@ -46,6 +46,7 @@ case "${target}" in
     packages+=(${MINGW_PACKAGE_PREFIX}-re2)
     packages+=(${MINGW_PACKAGE_PREFIX}-snappy)
     packages+=(${MINGW_PACKAGE_PREFIX}-thrift)
+    packages+=(${MINGW_PACKAGE_PREFIX}-xsimd)
     packages+=(${MINGW_PACKAGE_PREFIX}-zlib)
     packages+=(${MINGW_PACKAGE_PREFIX}-zstd)
   ;;
diff --git a/cpp/src/arrow/io/hdfs_test.cc b/cpp/src/arrow/io/hdfs_test.cc
index 2ebf950808..6b989378c1 100644
--- a/cpp/src/arrow/io/hdfs_test.cc
+++ b/cpp/src/arrow/io/hdfs_test.cc
@@ -28,8 +28,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/filesystem.hpp>  // NOLINT
-
 #include "arrow/buffer.h"
 #include "arrow/io/hdfs.h"
 #include "arrow/io/hdfs_internal.h"
@@ -38,6 +36,11 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/util.h"
 
+// boost/filesystem.hpp should be included after
+// arrow/util/windows_compatibility.h because boost/filesystem.hpp
+// includes windows.h implicitly.
+#include <boost/filesystem.hpp>  // NOLINT
+
 namespace arrow {
 namespace io {
 
diff --git a/cpp/src/arrow/util/io_util.cc b/cpp/src/arrow/util/io_util.cc
index 8d393d733d..eacaba4e60 100644
--- a/cpp/src/arrow/util/io_util.cc
+++ b/cpp/src/arrow/util/io_util.cc
@@ -103,7 +103,6 @@
 
 #ifdef _WIN32
 #include <psapi.h>
-#include <windows.h>
 
 #elif __APPLE__
 #include <mach/mach.h>
@@ -495,7 +494,7 @@ namespace {
 
 Result<NativePathString> NativeReal(const NativePathString& path) {
 #if _WIN32
-  std::array<wchar_t, _MAX_PATH> resolved;
+  std::array<wchar_t, _MAX_PATH> resolved = {};
   if (_wfullpath(const_cast<wchar_t*>(path.c_str()), resolved.data(), resolved.size()) ==
       nullptr) {
     return IOErrorFromWinError(errno, "Failed to resolve real path");