Address feedback

- Move `dremio` to `compose.yaml` at project root
- Move shebang to first line
- add `set_up_dremio_instance.sh` to pre-commit hook
- Fix `SQL_QUERY` variable format

Author: alinaliBQ

.github/workflows/cpp_extra.yml

@@ -373,7 +373,7 @@ jobs:
         run: docker network create odbc_net
       - name: Set Up Dremio Instance
         run: |
-          docker compose -f cpp/src/arrow/flight/sql/odbc/tests/dremio/docker-compose.yml up -d
+          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

.pre-commit-config.yaml

@@ -351,6 +351,7 @@ repos:
           ?^cpp/examples/minimal_build/run\.sh$|
           ?^cpp/examples/tutorial_examples/run\.sh$|
           ?^cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc\.sh$|
+          ?^cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance\.sh$|
           ?^dev/release/05-binary-upload\.sh$|
           ?^dev/release/08-binary-verify\.sh$|
           ?^dev/release/binary-recover\.sh$|

compose.yaml

@@ -139,6 +139,7 @@ x-hierarchy:
     - fedora-python
   - fedora-r-clang
   - python-sdist
+  - dremio
   - ubuntu-cpp:
     - ubuntu-cpp-static
     - ubuntu-c-glib:
@@ -376,6 +377,24 @@ 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:latest
+    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
+    healthcheck:
+      test: curl --fail http://localhost:9047 || exit 1
+      interval: 10s
+      timeout: 5s
+      retries: 30
+    networks:
+      - odbc_net
+
   ubuntu-cpp: &ubuntu-cpp-base
     # Usage:
     #   docker compose build ubuntu-cpp

cpp/src/arrow/flight/sql/odbc/tests/dremio/docker-compose.yml

@@ -1,3 +1,5 @@
+#!/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
@@ -15,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#!/bin/bash
 set -e
 
 HOST_URL="http://localhost:9047"
@@ -49,16 +50,29 @@ TOKEN=$(curl -s -X POST "$LOGIN_URL" \
      -d "{ \"userName\": \"$ADMIN_USER\", \"password\": \"$ADMIN_PASSWORD\" }" \
      | grep -oP '(?<="token":")[^"]+')
 
-SQL_QUERY="Create Table \$scratch.ODBCTest As SELECT CAST(2147483647 AS INTEGER) AS sinteger_max, CAST(9223372036854775807 AS BIGINT) AS sbigint_max, CAST(999999999 AS DECIMAL(38,0)) AS decimal_positive, CAST(3.40282347E38 AS FLOAT) AS float_max, CAST(1.7976931348623157E308 AS DOUBLE) AS double_max, CAST(true AS BOOLEAN) AS bit_true, CAST(DATE '9999-12-31' AS DATE) AS date_max, CAST(TIME '23:59:59' AS TIME) AS time_max, CAST(TIMESTAMP '9999-12-31 23:59:59' AS TIMESTAMP) AS timestamp_max;"
-ESCAPED_QUERY=$(printf '%s' "$SQL_QUERY" | sed 's/"/\\"/g')
-
+SQL_QUERY="
+Create Table \$scratch.ODBCTest As
+  SELECT CAST(2147483647 AS INTEGER) AS sinteger_max,
+         CAST(9223372036854775807 AS BIGINT) AS sbigint_max,
+         CAST(999999999 AS DECIMAL(38,0)) AS decimal_positive,
+         CAST(3.40282347E38 AS FLOAT) AS float_max,
+         CAST(1.7976931348623157E308 AS DOUBLE) AS double_max,
+         CAST(true AS BOOLEAN) AS bit_true,
+         CAST(DATE '9999-12-31' AS DATE) AS date_max,
+         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" \
      -H "Authorization: _dremio$TOKEN" \
      -H "Content-Type: application/json" \
-     -d "{\"sql\": \"$ESCAPED_QUERY\"}"
+     -d "$(python3 - <<'EOF'
+import json
+print(json.dumps({"sql": """$SQL_QUERY"""}))
+EOF
+)"
 
 echo ""
 echo "Finished setting up dremio docker instance."