apacheGH-30622: [GAC-47] Move Timestream ODBC driver seed under cpp/src/flightsql_odbc

.github/workflows/linux-build.yml

@@ -4,18 +4,18 @@ on:
   push:
     paths:
       - '.github/workflows/win-build.yml'
-      - 'cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/**'
+      - 'cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/**'
   pull_request:
     paths:
       - '.github/workflows/win-build.yml'
-      - 'cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/**'
+      - 'cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/**'
 
 env:
   CI_OUTPUT_PATH: "ci-output"
-  ODBC_LIB_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/lib"
-  ODBC_BIN_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin"
-  ODBC_BUILD_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/build"
-  TIMESTREAM_LOG_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/logs"
+  ODBC_LIB_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/lib"
+  ODBC_BIN_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin"
+  ODBC_BUILD_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/build"
+  TIMESTREAM_LOG_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/logs"
   TIMESTREAM_LOG_LEVEL: "4"
   BIG_TABLE_PAGINATION_TEST_ENABLE: "TRUE"
 
@@ -50,7 +50,7 @@ jobs:
     - name: run-cppcheck
       run: |
         sudo apt install cppcheck
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         sh run_cppcheck.sh
 
     - name: upload-cppcheck-results
@@ -68,26 +68,26 @@ jobs:
 
     - name: configure-and-build-driver
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         chmod +x build_linux_release64_deb.sh
         chmod +x scripts/build_linux.sh
         ./build_linux_release64_deb.sh
 
     - name: update-environment-with-ODBC_DRIVER_VERSION
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         read -r ODBC_DRIVER_VERSION < ./src/ODBC_DRIVER_VERSION.txt
         echo "ODBC_DRIVER_VERSION=$ODBC_DRIVER_VERSION" >> $GITHUB_ENV
 
     - name: upload-package
       uses: actions/upload-artifact@v3
       with:
         name: AmazonTimestreamODBC_${{env.ODBC_DRIVER_VERSION}}_RELEASE_amd64
-        path: cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/cmake-build64/AmazonTimestreamODBC_${{env.ODBC_DRIVER_VERSION}}_RELEASE_amd64.deb
+        path: cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/cmake-build64/AmazonTimestreamODBC_${{env.ODBC_DRIVER_VERSION}}_RELEASE_amd64.deb
 
     - name: register-odbc-driver
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         chmod +r -R ${{env.ODBC_LIB_PATH}}
         chmod +x scripts/register_driver_unix.sh
         sudo bash scripts/register_driver_unix.sh
@@ -96,7 +96,7 @@ jobs:
       id: rununittests
       run: |
         mkdir -p "${{env.TIMESTREAM_LOG_PATH}}"
-        ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-unit-tests --catch_system_errors=false
+        ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-unit-tests --catch_system_errors=false
 
     - name: upload-unit-test-report
       if: always()
@@ -113,15 +113,15 @@ jobs:
         name: odbc-unit-test-results
         path: |
           ./odbc_unit_test_result.xml
-          ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log 
+          ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log 
           ./aws_sdk_*.log
 
     # TODO re-enable integration tests
     # run integration tests
     # - name: run-odbc-tests
     #   id: runodbctests
     #   run: |
-    #     ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-integration-tests --catch_system_errors=false
+    #     ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-integration-tests --catch_system_errors=false
 
     - name: upload-odbc-test-report
       if: always()
@@ -156,7 +156,7 @@ jobs:
     - name: run-cppcheck
       run: |
         sudo apt install cppcheck
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         sh run_cppcheck.sh
 
     - name: upload-cppcheck-results
@@ -174,26 +174,26 @@ jobs:
 
     - name: configure-and-build-driver
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         chmod +x build_linux_debug64_deb.sh
         chmod +x scripts/build_linux.sh
         ./build_linux_debug64_deb.sh
 
     - name: update-environment-with-ODBC_DRIVER_VERSION
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         read -r ODBC_DRIVER_VERSION < ./src/ODBC_DRIVER_VERSION.txt
         echo "ODBC_DRIVER_VERSION=$ODBC_DRIVER_VERSION" >> $GITHUB_ENV
 
     - name: upload-package
       uses: actions/upload-artifact@v3
       with:
         name: AmazonTimestreamODBC_${{env.ODBC_DRIVER_VERSION}}_DEBUG_amd64
-        path: cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/cmake-build64/AmazonTimestreamODBC_${{env.ODBC_DRIVER_VERSION}}_DEBUG_amd64.deb
+        path: cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/cmake-build64/AmazonTimestreamODBC_${{env.ODBC_DRIVER_VERSION}}_DEBUG_amd64.deb
 
     - name: register-odbc-driver
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         chmod +r -R ${{env.ODBC_LIB_PATH}}
         chmod +x scripts/register_driver_unix.sh
         sudo bash scripts/register_driver_unix.sh
@@ -203,8 +203,8 @@ jobs:
       id: rununittests
       run: |
         mkdir -p "${{env.TIMESTREAM_LOG_PATH}}"
-        ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-unit-tests --catch_system_errors=false
-        gcovr --exclude-directories=cmake-build64/tests/integration-test/CMakeFiles/timestream-odbc-integration-tests.dir$ --exclude-directories=cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/cmake-build64/tests/unit-test/CMakeFiles/timestream-odbc-unit-tests.dir$ --cobertura --output coverage.cobertura.xml
+        ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-unit-tests --catch_system_errors=false
+        gcovr --exclude-directories=cmake-build64/tests/integration-test/CMakeFiles/timestream-odbc-integration-tests.dir$ --exclude-directories=cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/cmake-build64/tests/unit-test/CMakeFiles/timestream-odbc-unit-tests.dir$ --cobertura --output coverage.cobertura.xml
 
     - name: upload-test-report
       if: always()
@@ -221,16 +221,16 @@ jobs:
         name: odbc-unit-test-results-linux-debug
         path: |
           ./odbc_unit_test_result.xml
-          ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log 
+          ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log 
           ./aws_sdk_*.log
 
     # TODO re-enable integration tests and code coverage from integration tests
     # run odbc tests
     # - name: run-odbc-tests
     #   id: runodbctests
     #   run: |
-    #     ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-integration-tests --catch_system_errors=false
-    #     gcovr --exclude-directories=cmake-build64/tests/integration-test/CMakeFiles/timestream-odbc-integration-tests.dir$ --exclude-directories=cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/cmake-build64/tests/unit-test/CMakeFiles/timestream-odbc-unit-tests.dir$ --cobertura --output coverage.cobertura.xml
+    #     ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-integration-tests --catch_system_errors=false
+    #     gcovr --exclude-directories=cmake-build64/tests/integration-test/CMakeFiles/timestream-odbc-integration-tests.dir$ --exclude-directories=cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/cmake-build64/tests/unit-test/CMakeFiles/timestream-odbc-unit-tests.dir$ --cobertura --output coverage.cobertura.xml
 
     - name: Code Coverage Summary Report
       uses: irongut/[email protected]
@@ -269,7 +269,7 @@ jobs:
         name: odbc-test-results-linux-debug
         path: |
           ./odbc_test_result.xml
-          ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log 
+          ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log 
           ./aws_sdk_*.log   
 
     - name: upload-coverage

.github/workflows/mac-build.yml

@@ -4,21 +4,21 @@ on:
   push:
     paths:
       - '.github/workflows/win-build.yml'
-      - 'cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/**'
+      - 'cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/**'
   pull_request:
     paths:
       - '.github/workflows/win-build.yml'
-      - 'cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/**'
+      - 'cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/**'
 
 env:
   CI_OUTPUT_PATH: "ci-output"
-  ODBC_LIB_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/lib"
-  ODBC_BIN_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin"
-  ODBC_BUILD_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/build"
-  TIMESTREAM_LOG_PATH: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/logs"
+  ODBC_LIB_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/lib"
+  ODBC_BIN_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin"
+  ODBC_BUILD_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/build"
+  TIMESTREAM_LOG_PATH: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/logs"
   TIMESTREAM_LOG_LEVEL: "4"
-  ODBCINSTINI: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/lib/timestream-odbc-install.ini"
-  ODBCINI: "${{github.workspace}}/cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/odbc.ini"
+  ODBCINSTINI: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/lib/timestream-odbc-install.ini"
+  ODBCINI: "${{github.workspace}}/cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/odbc.ini"
   BIG_TABLE_PAGINATION_TEST_ENABLE: "TRUE"
 
   # # AAD Test environment variables. Uncomment out to use GitHub secrets to enable AAD integration tests
@@ -49,7 +49,7 @@ jobs:
     - name: run-cppcheck
       run: |
         brew install cppcheck
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         sh run_cppcheck.sh
     - name: upload-cppcheck-results
       if: failure()
@@ -69,25 +69,25 @@ jobs:
 
     - name: configure-and-build-driver
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         chmod +x build_mac_release64.sh
         ./build_mac_release64.sh
 
     - name: update-environment-with-ODBC_DRIVER_VERSION
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         read -r ODBC_DRIVER_VERSION < ./src/ODBC_DRIVER_VERSION.txt
         echo "ODBC_DRIVER_VERSION=$ODBC_DRIVER_VERSION" >> $GITHUB_ENV
 
     - name: upload-package
       uses: actions/upload-artifact@v3
       with:
         name: AmazonTimestreamODBC-${{env.ODBC_DRIVER_VERSION}}.pkg
-        path: ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/cmake-build64/AmazonTimestreamODBC-${{env.ODBC_DRIVER_VERSION}}.pkg
+        path: ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/cmake-build64/AmazonTimestreamODBC-${{env.ODBC_DRIVER_VERSION}}.pkg
 
     - name: register-odbc-driver
       run: |
-        cd cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver
+        cd cpp/src/flightsql_odbc/amazon-timestream-odbc-driver
         chmod +x scripts/register_driver_unix.sh
         ./scripts/register_driver_unix.sh
 
@@ -96,7 +96,7 @@ jobs:
       run: |
         mkdir -p "${{env.TIMESTREAM_LOG_PATH}}"
         export DYLD_LIBRARY_PATH=${{env.ODBC_LIB_PATH}}:$DYLD_LIBRARY_PATH     
-        ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-unit-tests --catch_system_errors=false
+        ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-unit-tests --catch_system_errors=false
 
     - name: upload-unit-test-report
       if: always()
@@ -113,14 +113,14 @@ jobs:
         name: odbc-unit-test-results
         path: |
           ./odbc_unit_test_result.xml
-          ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log
+          ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/logs/timestream_odbc_*.log
 
     # TODO re-enable integration tests
     # - name: run-integration-tests
     #   id: runintegrationtests
     #   run: |
     #     export DYLD_LIBRARY_PATH=${{env.ODBC_LIB_PATH}}:$DYLD_LIBRARY_PATH     
-    #     ./cpp/src/arrow/flight/sql/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-integration-tests --catch_system_errors=false
+    #     ./cpp/src/flightsql_odbc/amazon-timestream-odbc-driver/build/odbc/bin/timestream-odbc-integration-tests --catch_system_errors=false
 
     - name: upload-integration-test-report
       if: always()