investigate

justing-bq · justing-bq · commit 3a5022d6a0fb · 2026-02-06T11:24:15.000-08:00
diff --git a/.github/workflows/cpp_extra.yml b/.github/workflows/cpp_extra.yml
@@ -423,156 +423,155 @@ jobs:
           ulimit -c unlimited  # must enable within the same shell
           sudo ci/scripts/cpp_test.sh $(pwd) $(pwd)/build
 
-  odbc-msvc:
-    needs: check-labels
-    name: ODBC Windows
-    runs-on: windows-2022
-    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(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_FLIGHT_SQL_ODBC_INSTALLER: ON
-      ARROW_HOME: /usr
-      CMAKE_GENERATOR: Ninja
-      CMAKE_INSTALL_PREFIX: /usr
-      VCPKG_BINARY_SOURCES: 'clear;nugettimeout,600;nuget,GitHub,readwrite'
-      VCPKG_DEFAULT_TRIPLET: x64-windows
-      CMAKE_CXX_STANDARD: "20"
-    steps:
-      - name: Disable Crash Dialogs
-        run: |
-          reg add `
-            "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
-            /v DontShowUI `
-            /t REG_DWORD `
-            /d 1 `
-            /f
-      - name: Checkout Arrow
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Download Timezone Database
-        shell: bash
-        run: ci/scripts/download_tz_database.sh
-      - name: Install ccache
-        shell: bash
-        run: |
-          ci/scripts/install_ccache.sh 4.12.1 /usr
-      - name: Setup ccache
-        shell: bash
-        run: |
-          ci/scripts/ccache_setup.sh
-      - name: ccache info
-        id: ccache-info
-        shell: bash
-        run: |
-          echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
-      - name: Cache ccache
-        uses: actions/cache@v5
-        with:
-          path: ${{ steps.ccache-info.outputs.cache-dir }}
-          key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
-          restore-keys: cpp-odbc-ccache-windows-x64-
-      - name: Checkout vcpkg
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          path: vcpkg
-          repository: microsoft/vcpkg
-      - name: Bootstrap vcpkg
-        run: |
-          vcpkg\bootstrap-vcpkg.bat
-          $VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
-          Write-Output ${VCPKG_ROOT} | `
-            Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
-          Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
-            Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
-      - name: Setup NuGet credentials for vcpkg caching
-        shell: bash
-        run: |
-          $(vcpkg fetch nuget | tail -n 1) \
-            sources add \
-            -source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
-            -storepasswordincleartext \
-            -name "GitHub" \
-            -username "$GITHUB_REPOSITORY_OWNER" \
-            -password "${{ secrets.GITHUB_TOKEN }}"
-          $(vcpkg fetch nuget | tail -n 1) \
-            setapikey "${{ secrets.GITHUB_TOKEN }}" \
-            -source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
-      - name: Build
-        shell: cmd
-        run: |
-          set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
-          bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
-      - name: Register Arrow Flight SQL ODBC Driver
-        shell: cmd
-        run: |
-          call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
-      # GH-48270 TODO: Resolve segementation fault during Arrow library unload, segementation fault is caught with `ci/scripts/cpp_test.sh`
-      # GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI and run tests with `ci/scripts/cpp_test.sh` instead
-      # GH-48547 TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.
-      - name: Run ODBC Unit Tests
-        shell: cmd
-        run: |
-          build\cpp\%ARROW_BUILD_TYPE%\arrow-odbc-spi-impl-test.exe
-      - name: Run ODBC Driver Tests
-        shell: cmd
-        run: |
-          build\cpp\%ARROW_BUILD_TYPE%\arrow-flight-sql-odbc-test.exe
-      - name: Install WiX Toolset
-        shell: pwsh
-        run: |
-          Invoke-WebRequest -Uri https://github.com/wixtoolset/wix/releases/download/v6.0.0/wix-cli-x64.msi -OutFile wix-cli-x64.msi
-          Start-Process -FilePath wix-cli-x64.msi -ArgumentList '/quiet', 'Include_freethreaded=1' -Wait
-          echo "C:\Program Files\WiX Toolset v6.0\bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: Build MSI ODBC installer
-        shell: pwsh
-        run: |
-          # Verify WiX version
-          wix --version
-          cd build/cpp
-          cpack
-      - name: Upload the artifacts to the job
-        uses: actions/upload-artifact@v6
-        with:
-          name: flight-sql-odbc-msi-installer
-          path: build/cpp/Apache Arrow Flight SQL ODBC-*-win64.msi
-          if-no-files-found: error
-      # Upload ODBC installer as nightly release in scheduled runs
-      - name: Prepare ODBC installer for sync
-        if: github.event_name == 'schedule'
-        run: |
-          mkdir odbc-installer
-          Move-Item "build/cpp/Apache Arrow Flight SQL ODBC-*-win64.msi" odbc-installer/
-          tree odbc-installer /f
-      - name: Sync to Remote
-        if: github.event_name == 'schedule'
-        uses: ./.github/actions/sync-nightlies
-        with:
-          upload: true
-          switches: -avzh --update --delete --progress
-          local_path: odbc-installer
-          remote_path: ${{ secrets.NIGHTLIES_RSYNC_PATH }}/arrow/odbc
-          remote_host: ${{ secrets.NIGHTLIES_RSYNC_HOST }}
-          remote_port: ${{ secrets.NIGHTLIES_RSYNC_PORT }}
-          remote_user: ${{ secrets.NIGHTLIES_RSYNC_USER }}
-          remote_key: ${{ secrets.NIGHTLIES_RSYNC_KEY }}
-          remote_host_key: ${{ secrets.NIGHTLIES_RSYNC_HOST_KEY }}
+  # odbc-msvc:
+  #   needs: check-labels
+  #   name: ODBC Windows
+  #   runs-on: windows-2022
+  #   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(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_FLIGHT_SQL_ODBC_INSTALLER: ON
+  #     ARROW_HOME: /usr
+  #     CMAKE_GENERATOR: Ninja
+  #     CMAKE_INSTALL_PREFIX: /usr
+  #     VCPKG_BINARY_SOURCES: 'clear;nugettimeout,600;nuget,GitHub,readwrite'
+  #     VCPKG_DEFAULT_TRIPLET: x64-windows
+  #   steps:
+  #     - name: Disable Crash Dialogs
+  #       run: |
+  #         reg add `
+  #           "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
+  #           /v DontShowUI `
+  #           /t REG_DWORD `
+  #           /d 1 `
+  #           /f
+  #     - name: Checkout Arrow
+  #       uses: actions/checkout@v6
+  #       with:
+  #         fetch-depth: 0
+  #         submodules: recursive
+  #     - name: Download Timezone Database
+  #       shell: bash
+  #       run: ci/scripts/download_tz_database.sh
+  #     - name: Install ccache
+  #       shell: bash
+  #       run: |
+  #         ci/scripts/install_ccache.sh 4.12.1 /usr
+  #     - name: Setup ccache
+  #       shell: bash
+  #       run: |
+  #         ci/scripts/ccache_setup.sh
+  #     - name: ccache info
+  #       id: ccache-info
+  #       shell: bash
+  #       run: |
+  #         echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
+  #     - name: Cache ccache
+  #       uses: actions/cache@v5
+  #       with:
+  #         path: ${{ steps.ccache-info.outputs.cache-dir }}
+  #         key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
+  #         restore-keys: cpp-odbc-ccache-windows-x64-
+  #     - name: Checkout vcpkg
+  #       uses: actions/checkout@v6
+  #       with:
+  #         fetch-depth: 0
+  #         path: vcpkg
+  #         repository: microsoft/vcpkg
+  #     - name: Bootstrap vcpkg
+  #       run: |
+  #         vcpkg\bootstrap-vcpkg.bat
+  #         $VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
+  #         Write-Output ${VCPKG_ROOT} | `
+  #           Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
+  #         Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
+  #           Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
+  #     - name: Setup NuGet credentials for vcpkg caching
+  #       shell: bash
+  #       run: |
+  #         $(vcpkg fetch nuget | tail -n 1) \
+  #           sources add \
+  #           -source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
+  #           -storepasswordincleartext \
+  #           -name "GitHub" \
+  #           -username "$GITHUB_REPOSITORY_OWNER" \
+  #           -password "${{ secrets.GITHUB_TOKEN }}"
+  #         $(vcpkg fetch nuget | tail -n 1) \
+  #           setapikey "${{ secrets.GITHUB_TOKEN }}" \
+  #           -source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
+  #     - name: Build
+  #       shell: cmd
+  #       run: |
+  #         set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
+  #         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+  #         set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
+  #         bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
+  #     - name: Register Arrow Flight SQL ODBC Driver
+  #       shell: cmd
+  #       run: |
+  #         call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
+  #     # GH-48270 TODO: Resolve segementation fault during Arrow library unload, segementation fault is caught with `ci/scripts/cpp_test.sh`
+  #     # GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI and run tests with `ci/scripts/cpp_test.sh` instead
+  #     # GH-48547 TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.
+  #     - name: Run ODBC Unit Tests
+  #       shell: cmd
+  #       run: |
+  #         build\cpp\%ARROW_BUILD_TYPE%\arrow-odbc-spi-impl-test.exe
+  #     - name: Run ODBC Driver Tests
+  #       shell: cmd
+  #       run: |
+  #         build\cpp\%ARROW_BUILD_TYPE%\arrow-flight-sql-odbc-test.exe
+  #     - name: Install WiX Toolset
+  #       shell: pwsh
+  #       run: |
+  #         Invoke-WebRequest -Uri https://github.com/wixtoolset/wix/releases/download/v6.0.0/wix-cli-x64.msi -OutFile wix-cli-x64.msi
+  #         Start-Process -FilePath wix-cli-x64.msi -ArgumentList '/quiet', 'Include_freethreaded=1' -Wait
+  #         echo "C:\Program Files\WiX Toolset v6.0\bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+  #     - name: Build MSI ODBC installer
+  #       shell: pwsh
+  #       run: |
+  #         # Verify WiX version
+  #         wix --version
+  #         cd build/cpp
+  #         cpack
+  #     - name: Upload the artifacts to the job
+  #       uses: actions/upload-artifact@v6
+  #       with:
+  #         name: flight-sql-odbc-msi-installer
+  #         path: build/cpp/Apache Arrow Flight SQL ODBC-*-win64.msi
+  #         if-no-files-found: error
+  #     # Upload ODBC installer as nightly release in scheduled runs
+  #     - name: Prepare ODBC installer for sync
+  #       if: github.event_name == 'schedule'
+  #       run: |
+  #         mkdir odbc-installer
+  #         Move-Item "build/cpp/Apache Arrow Flight SQL ODBC-*-win64.msi" odbc-installer/
+  #         tree odbc-installer /f
+  #     - name: Sync to Remote
+  #       if: github.event_name == 'schedule'
+  #       uses: ./.github/actions/sync-nightlies
+  #       with:
+  #         upload: true
+  #         switches: -avzh --update --delete --progress
+  #         local_path: odbc-installer
+  #         remote_path: ${{ secrets.NIGHTLIES_RSYNC_PATH }}/arrow/odbc
+  #         remote_host: ${{ secrets.NIGHTLIES_RSYNC_HOST }}
+  #         remote_port: ${{ secrets.NIGHTLIES_RSYNC_PORT }}
+  #         remote_user: ${{ secrets.NIGHTLIES_RSYNC_USER }}
+  #         remote_key: ${{ secrets.NIGHTLIES_RSYNC_KEY }}
+  #         remote_host_key: ${{ secrets.NIGHTLIES_RSYNC_HOST_KEY }}
 
   report-extra-cpp:
     if: github.event_name == 'schedule' && always()
@@ -582,6 +581,6 @@ jobs:
       - jni-macos
       - msvc-arm64
       - odbc-macos
-      - odbc-msvc
+      # - odbc-msvc
     uses: ./.github/workflows/report_ci.yml
     secrets: inherit
diff --git a/cpp/src/arrow/flight/sql/odbc/odbc_impl/system_dsn.cc b/cpp/src/arrow/flight/sql/odbc/odbc_impl/system_dsn.cc
@@ -20,6 +20,7 @@
 #include "arrow/result.h"
 #include "arrow/util/utf8.h"
 
+#include <iostream>
 #include <sstream>
 
 namespace arrow::flight::sql::odbc {
@@ -47,6 +48,9 @@ void PostLastInstallerError() {
   wchar_t msg[BUFFER_SIZE];
   SQLInstallerError(1, &code, msg, BUFFER_SIZE, NULL);
 
+  std::wcout << L"TestLog: Installer error code: " << code
+             << L", message: " << msg << std::endl;
+
   std::wstringstream buf;
   buf << L"Message: \"" << msg << L"\", Code: " << code;
   std::wstring error_msg = buf.str();
@@ -77,15 +81,24 @@ bool UnregisterDsn(const std::wstring& dsn) {
  * @return True on success and false on fail.
  */
 bool RegisterDsn(const Configuration& config, LPCWSTR driver) {
+  std::cout << "TestLog: Registering DSN: " << config.Get(FlightSqlConnection::DSN)
+            << std::endl;
+
   const std::string& dsn = config.Get(FlightSqlConnection::DSN);
+  std::cout << "TestLog: Using dsn = " << dsn << std::endl;
+
   auto wdsn_result = arrow::util::UTF8ToWideString(dsn);
+  std::cout << "TestLog: Converted wdsn_result" << std::endl;
   if (!wdsn_result.status().ok()) {
+    std::cout << "TestLog: Error converting wdsn_result" << std::endl;
     PostArrowUtilError(wdsn_result.status());
     return false;
   }
-  std::wstring wdsn = wdsn_result.ValueOrDie();
 
+  std::wstring wdsn = wdsn_result.ValueOrDie();
+  std::wcout << "TestLog: Converted wdsn = " << wdsn << std::endl;
   if (!SQLWriteDSNToIni(wdsn.c_str(), driver)) {
+    std::cout << "TestLog: Error writing DSN to ini" << std::endl;
     PostLastInstallerError();
     return false;
   }
@@ -100,25 +113,28 @@ bool RegisterDsn(const Configuration& config, LPCWSTR driver) {
 
     auto wkey_result = arrow::util::UTF8ToWideString(key);
     if (!wkey_result.status().ok()) {
+      std::cout << "TestLog: Error converting wkey_result = " <<  wkey_result.status().message() << std::endl;
       PostArrowUtilError(wkey_result.status());
       return false;
     }
     std::wstring wkey = wkey_result.ValueOrDie();
 
     auto wvalue_result = arrow::util::UTF8ToWideString(it->second);
     if (!wvalue_result.status().ok()) {
+      std::cout << "TestLog: Error converting wvalue_result = " <<  wvalue_result.status().message() << std::endl;
       PostArrowUtilError(wvalue_result.status());
       return false;
     }
     std::wstring wvalue = wvalue_result.ValueOrDie();
-
     if (!SQLWritePrivateProfileString(wdsn.c_str(), wkey.c_str(), wvalue.c_str(),
                                       L"ODBC.INI")) {
+      std::cout << "TestLog: Error writing private profile string" << std::endl;
       PostLastInstallerError();
       return false;
     }
   }
 
+  std::cout << "TestLog: Successfully registered DSN" << std::endl;
   return true;
 }
 }  // namespace arrow::flight::sql::odbc
