Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,19 +337,22 @@ 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
ARROW_BUILD_TESTS: ON
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
Comment on lines +352 to 354
Copy link
Author

@alinaliBQ alinaliBQ Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_HOME and CMAKE_INSTALL_PREFIX should match, so I fixed it

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
Expand All @@ -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: |
Expand Down
4 changes: 4 additions & 0 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.

#include <absl/synchronization/mutex.h>

#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.h"

#include "arrow/compute/api.h"
Expand All @@ -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);
}
Comment on lines 41 to 44
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The potential deadlock errors started appearing after C++ 20 is enabled. I don't know the root cause, but this line disables the deadlock detection and resolves the issue. Arrow community has confirmed that absl is not used directly in Arrow project, so the error likely came from gRPC.


FlightSqlDriver::~FlightSqlDriver() {
Expand Down
Loading