Skip to content
Closed
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
16 changes: 16 additions & 0 deletions .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,22 @@ jobs:
sudo sysctl -w vm.mmap_rnd_bits=28
source ci/scripts/util_enable_core_dumps.sh
archery docker run ubuntu-cpp-odbc
- name: Check ODBC Dependency
run: |
# ODBC dependency should not include other Arrow libraries
ldd "$(pwd)/build/cpp/release/libarrow_flight_sql_odbc.so"
archery linking check-dependencies \
--disallow libarrow \
--disallow libarrow_acero \
--disallow libarrow_compute \
--disallow libarrow_dataset \
--disallow libarrow_flight \
--disallow libarrow_flight_sql \
--disallow libarrow_substrait \
--disallow libarrow_testing \
--disallow libgandiva \
--disallow libparquet \
"$(pwd)/build/cpp/release/libarrow_flight_sql_odbc.so"
- name: Save Docker Volumes
if: ${{ !cancelled() }}
continue-on-error: true
Expand Down
5 changes: 3 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,12 @@ services:
depends_on:
dremio:
condition: service_healthy
# Use `/arrow/build` so build artifacts are visible on the CI host
command: >
/bin/bash -c "
/arrow/ci/scripts/cpp_build.sh /arrow /build &&
/arrow/ci/scripts/cpp_build.sh /arrow /arrow/build &&
sudo /arrow/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc.sh /usr/local/lib/libarrow_flight_sql_odbc.so &&
/arrow/ci/scripts/cpp_test.sh /arrow /build"
/arrow/ci/scripts/cpp_test.sh /arrow /arrow/build"

ubuntu-cpp-minimal:
# Arrow build with minimal components/dependencies
Expand Down
3 changes: 2 additions & 1 deletion dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,8 @@ Libraries and header files for Apache Arrow Flight SQL.
%package -n %{name}%{so_version}-flight-sql-odbc-libs
Summary: C++ library for interacting with SQL databases via ODBC.
License: Apache-2.0
Requires: %{name}%{so_version}-flight-sql-libs = %{version}-%{release}
# GH-55432: ODBC statically links to Arrow Libraries on Linux,
# Arrow library dependency is not required
Requires(post): /usr/bin/odbcinst
Requires(postun): /usr/bin/odbcinst

Expand Down
Loading