kou commented on code in PR #55604:
URL: https://github.com/apache/arrow/pull/55604#discussion_r4656342474
##########
compose.yaml:
##########
@@ -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"
Review Comment:
Can we revert this now?
##########
.github/workflows/cpp_extra.yml:
##########
@@ -487,6 +487,7 @@ jobs:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: jni-windows
+ # On Linux, link ODBC dynamically to follow general RPM/DEB guidelines
Review Comment:
Can we revert added comments in `cpp_extra.yml`? It seems that we already
have similar comments in `CMakeLists.txt`.
##########
.github/workflows/cpp_extra.yml:
##########
@@ -840,6 +843,14 @@ jobs:
uses: ./.github/actions/odbc-windows
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Check ODBC Dependency
+ shell: cmd
+ run: |
+ # ODBC dependency should not include other Arrow libraries
+ call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 ||
exit /b 1
+ dumpbin /dependents
build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll > odbc_dependents.txt ||
exit /b 1
+ type odbc_dependents.txt
+ bash -c "if grep -i '^ *arrow.*\.dll' odbc_dependents.txt; then echo
'Error: Flight SQL ODBC DLL depends on Arrow DLLs'; exit 1; fi"
Review Comment:
It seems that we don't need this because we use `ARROW_BUILD_SHARED: OFF`.
No Arrow DLL exists in this environment.
##########
cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt:
##########
@@ -57,21 +57,13 @@ elseif(WIN32)
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS
arrow_odbc_spi_impl ${ARROW_FLIGHT_SQL_ODBC_TEST_LIBS}
arrow_flight_sql_odbc_static
${ARROW_TEST_STATIC_LINK_LIBS})
-elseif(APPLE)
- # GH-49651: Link the ODBC driver dynamically on macOS.
+else()
Review Comment:
deb/RPM packages build shared libraries but users may want to build without
shared libraries. How about accepting the case by changing this `else()` to
```suggestion
elseif(APPLE OR ARROW_BUILD_SHARED)
```
and keep the below removed `else()` block?
##########
.github/workflows/cpp_extra.yml:
##########
@@ -840,6 +843,14 @@ jobs:
uses: ./.github/actions/odbc-windows
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Check ODBC Dependency
+ shell: cmd
+ run: |
+ # ODBC dependency should not include other Arrow libraries
Review Comment:
`#` isn't a comment character in `cmd.exe`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]