diff --git a/.github/workflows/cpp_extra.yml b/.github/workflows/cpp_extra.yml index 612175e60f6..d45d7f54b7d 100644 --- a/.github/workflows/cpp_extra.yml +++ b/.github/workflows/cpp_extra.yml @@ -337,8 +337,11 @@ jobs: if: >- needs.check-labels.outputs.force == 'true' || contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') || - contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: C++') + contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: C++') || + contains(join(github.event.pull_request.changed_files, ' '), 'cpp/src/arrow/flight/sql/odbc/') timeout-minutes: 240 + permissions: + packages: write env: ARROW_BUILD_SHARED: ON ARROW_BUILD_STATIC: OFF @@ -346,10 +349,10 @@ jobs: ARROW_BUILD_TYPE: release ARROW_DEPENDENCY_SOURCE: VCPKG ARROW_FLIGHT_SQL_ODBC: ON - ARROW_SIMD_LEVEL: AVX2 + ARROW_HOME: /usr CMAKE_GENERATOR: Ninja CMAKE_INSTALL_PREFIX: /usr - VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite' + VCPKG_BINARY_SOURCES: 'clear;nugettimeout,600;nuget,GitHub,readwrite' VCPKG_DEFAULT_TRIPLET: x64-windows steps: - name: Disable Crash Dialogs @@ -368,10 +371,6 @@ jobs: - name: Download Timezone Database shell: bash run: ci/scripts/download_tz_database.sh - - name: Install cmake - shell: bash - run: | - ci/scripts/install_cmake.sh 4.1.2 /usr - name: Install ccache shell: bash run: | diff --git a/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.cc b/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.cc index 8b24762bfc3..c6a813cfd48 100644 --- a/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.cc +++ b/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.cc @@ -15,6 +15,8 @@ // specific language governing permissions and limitations // under the License. +#include + #include "arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.h" #include "arrow/compute/api.h" @@ -37,6 +39,8 @@ FlightSqlDriver::FlightSqlDriver() RegisterComputeKernels(); // Register log after compute kernels check to avoid segfaults RegisterLog(); + // GH-48637: Disable Absl Deadlock detection from upstream projects + absl::SetMutexDeadlockDetectionMode(absl::OnDeadlockCycle::kIgnore); } FlightSqlDriver::~FlightSqlDriver() {