diff --git a/.github/workflows/cpp_extra.yml b/.github/workflows/cpp_extra.yml index 73b06f9deec..6a21313f05f 100644 --- a/.github/workflows/cpp_extra.yml +++ b/.github/workflows/cpp_extra.yml @@ -372,18 +372,22 @@ jobs: persist-credentials: false fetch-depth: 0 submodules: recursive - - name: Cache Docker Volumes - uses: actions/cache@v5 - with: - 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: Set Up Dremio Instance + run: | + docker compose up -d dremio + cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh + - name: Cache Docker Volumes + uses: actions/cache@v5 + with: + path: .docker + key: ubuntu-cpp-odbc-${{ hashFiles('cpp/**') }} + restore-keys: ubuntu-cpp-odbc- - name: Execute Docker Build env: ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e7cf88b16c1..a9513a93098 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -350,6 +350,7 @@ repos: ?^cpp/src/arrow/flight/sql/odbc/install/mac/postinstall$| ?^cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc\.sh$| ?^cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini\.sh$| + ?^cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance\.sh$| ?^dev/release/05-binary-upload\.sh$| ?^dev/release/07-flightsqlodbc-upload\.sh$| ?^dev/release/09-binary-verify\.sh$| diff --git a/compose.yaml b/compose.yaml index f527a835a3b..10431a98024 100644 --- a/compose.yaml +++ b/compose.yaml @@ -135,6 +135,7 @@ x-hierarchy: - debian-ruby - debian-python: - debian-docs + - dremio - fedora-cpp: - fedora-python - fedora-r-clang @@ -371,6 +372,21 @@ services: /arrow/ci/scripts/cpp_build.sh /arrow /build && /arrow/ci/scripts/cpp_test.sh /arrow /build" + dremio: + platform: linux/x86_64 + image: dremio/dremio-oss:26.0.0 + ports: + - 9047:9047 # REST API + - 31010:31010 # JDBC/ODBC + - 32010:32010 + environment: + - "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 + timeout: 5s + retries: 30 + ubuntu-cpp: &ubuntu-cpp-base # Usage: # docker compose build ubuntu-cpp @@ -509,6 +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;port=32010;pwd=admin2025;uid=admin;useEncryption=false;UseWideChar=true;" ARROW_GANDIVA: "OFF" ARROW_GCS: "OFF" ARROW_HDFS: "OFF" @@ -517,6 +534,9 @@ services: ARROW_S3: "OFF" ARROW_SUBSTRAIT: "OFF" # Register ODBC before running tests + depends_on: + dremio: + condition: service_healthy command: > /bin/bash -c " /arrow/ci/scripts/cpp_build.sh /arrow /build && diff --git a/cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh b/cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh new file mode 100755 index 00000000000..dd9868e05c1 --- /dev/null +++ b/cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh @@ -0,0 +1,134 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -euo pipefail + +HOST_URL="http://localhost:9047" +NEW_USER_URL="$HOST_URL/apiv2/bootstrap/firstuser" +LOGIN_URL="$HOST_URL/apiv2/login" +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. +attempt=1 +until status_code="$( + curl --silent \ + --output /dev/null \ + --write-out '%{http_code}' \ + "$NEW_USER_URL" +)"; [[ "$status_code" == "200" || "$status_code" == "404" || "$status_code" == "405" ]]; 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... HTTP $status_code" + attempt=$((attempt + 1)) + sleep "$WAIT_INTERVAL_SECONDS" +done + +echo "" +echo "Creating admin user..." + +# Create new admin account. +curl --fail --silent --show-error \ + -X PUT "$NEW_USER_URL" \ + -H "Content-Type: application/json" \ + -d "$(python3 - <