Address review feedback

Author: justing-bq

.github/workflows/cpp_extra.yml

@@ -372,6 +372,12 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
           submodules: recursive
+      - name: Setup Python on hosted runner
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3
+      - name: Setup Archery
+        run: python3 -m pip install -e dev/archery[docker]
       - name: Set Up Dremio Instance
         run: |
           docker compose up -d dremio
@@ -382,12 +388,6 @@ jobs:
           path: .docker
           key: ubuntu-cpp-odbc-${{ hashFiles('cpp/**') }}
           restore-keys: ubuntu-cpp-odbc-
-      - name: Setup Python on hosted runner
-        uses: actions/setup-python@v6
-        with:
-          python-version: 3
-      - name: Setup Archery
-        run: python3 -m pip install -e dev/archery[docker]
       - name: Execute Docker Build
         env:
           ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}

compose.yaml

@@ -374,14 +374,13 @@ services:
 
   dremio:
     platform: linux/x86_64
-    image: dremio/dremio-oss:latest
+    image: dremio/dremio-oss:26.0.0
     ports:
       - 9047:9047  # REST API
       - 31010:31010  # JDBC/ODBC
       - 32010:32010
-    container_name: dremio_container
     environment:
-    - DREMIO_JAVA_SERVER_EXTRA_OPTS=-Dsaffron.default.charset=UTF-8 -Dsaffron.default.nationalcharset=UTF-8 -Dsaffron.default.collation.name=UTF-8$$en_US
+      - "DREMIO_JAVA_SERVER_EXTRA_OPTS=-Dsaffron.default.charset=UTF-8 -Dsaffron.default.nationalcharset=UTF-8 -Dsaffron.default.collation.name=UTF-8$$en_US"
     healthcheck:
       test: curl --fail http://localhost:9047 || exit 1
       interval: 10s
@@ -526,7 +525,7 @@ services:
       ARROW_DEPENDENCY_SOURCE: BUNDLED
       ARROW_DEPENDENCY_USE_SHARED: "OFF"
       ARROW_FLIGHT_SQL_ODBC: "ON"
-      ARROW_FLIGHT_SQL_ODBC_CONN: "driver={Apache Arrow Flight SQL ODBC Driver};HOST=dremio_container;port=32010;pwd=admin2025;uid=admin;useEncryption=false;UseWideChar=true;"
+      ARROW_FLIGHT_SQL_ODBC_CONN: "driver={Apache Arrow Flight SQL ODBC Driver};HOST=dremio;port=32010;pwd=admin2025;uid=admin;useEncryption=false;UseWideChar=true;"
       ARROW_GANDIVA: "OFF"
       ARROW_GCS: "OFF"
       ARROW_HDFS: "OFF"
@@ -536,7 +535,8 @@ services:
       ARROW_SUBSTRAIT: "OFF"
     # Register ODBC before running tests
     depends_on:
-      - dremio
+      dremio:
+         condition: service_healthy
     command: >
       /bin/bash -c "
         /arrow/ci/scripts/cpp_build.sh /arrow /build &&

cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh

@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -euo pipefail
 
 HOST_URL="http://localhost:9047"
 NEW_USER_URL="$HOST_URL/apiv2/bootstrap/firstuser"
@@ -27,28 +27,80 @@ SQL_URL="$HOST_URL/api/v3/sql"
 ADMIN_USER="admin"
 ADMIN_PASSWORD="admin2025"
 
+MAX_WAIT_ATTEMPTS=60
+WAIT_INTERVAL_SECONDS=5
+
 # Wait for Dremio to be available.
-until curl -s "$NEW_USER_URL"; do
-    echo 'Waiting for Dremio to start...'
-    sleep 5
+attempt=1
+until curl --fail --silent --show-error \
+     --output /dev/null \
+     --max-time 5 \
+     "$NEW_USER_URL"; do
+
+     if [[ "$attempt" -ge "$MAX_WAIT_ATTEMPTS" ]]; then
+          echo "Timed out waiting for Dremio to start." >&2
+          exit 1
+     fi
+
+     echo "Waiting for Dremio to start... ($attempt/$MAX_WAIT_ATTEMPTS)"
+     attempt=$((attempt + 1))
+     sleep "$WAIT_INTERVAL_SECONDS"
 done
 
 echo ""
-echo 'Creating admin user...'
+echo "Creating admin user..."
 
 # Create new admin account.
-curl -X PUT "$NEW_USER_URL" \
+curl --fail --silent --show-error \
+     -X PUT "$NEW_USER_URL" \
      -H "Content-Type: application/json" \
-     -d "{ \"userName\": \"$ADMIN_USER\", \"password\": \"$ADMIN_PASSWORD\" }"
+     -d "$(python3 - <<EOF
+import json
+print(json.dumps({
+    "userName": "$ADMIN_USER",
+    "password": "$ADMIN_PASSWORD"
+}))
+EOF
+)"
 
 echo ""
 echo "Created admin user."
 
-# Use admin account to login and acquire a token.
-TOKEN=$(curl -s -X POST "$LOGIN_URL" \
+echo "Logging in as admin user..."
+
+# Login and capture response body.
+LOGIN_RESPONSE="$(curl --fail --silent --show-error \
+     -X POST "$LOGIN_URL" \
      -H "Content-Type: application/json" \
-     -d "{ \"userName\": \"$ADMIN_USER\", \"password\": \"$ADMIN_PASSWORD\" }" \
-     | grep -oP '(?<="token":")[^"]+')
+     -d "$(python3 - <<EOF
+import json
+print(json.dumps({
+    "userName": "$ADMIN_USER",
+    "password": "$ADMIN_PASSWORD"
+}))
+EOF
+)")"
+
+# Extract token safely using Python JSON parsing.
+TOKEN="$(python3 - <<EOF
+import json
+import sys
+
+try:
+    response = json.loads("""$LOGIN_RESPONSE""")
+except json.JSONDecodeError as exc:
+    print(f"Failed to parse login response JSON: {exc}", file=sys.stderr)
+    sys.exit(1)
+
+token = response.get("token")
+
+if not token:
+    print("Login response did not contain a token.", file=sys.stderr)
+    sys.exit(1)
+
+print(token)
+EOF
+)"
 
 SQL_QUERY="
 Create Table \$scratch.ODBCTest As
@@ -62,10 +114,12 @@ Create Table \$scratch.ODBCTest As
          CAST(TIME '23:59:59' AS TIME) AS time_max,
          CAST(TIMESTAMP '9999-12-31 23:59:59' AS TIMESTAMP) AS timestamp_max;
 "
+
 echo "Creating \$scratch.ODBCTest table."
 
 # Create a new table by sending a SQL query.
-curl -i -X POST "$SQL_URL" \
+curl --fail --silent --show-error \
+     -X POST "$SQL_URL" \
      -H "Authorization: _dremio$TOKEN" \
      -H "Content-Type: application/json" \
      -d "$(python3 - <<EOF