Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,12 @@ jobs:
with:
fetch-depth: 0
submodules: recursive
- name: Create Docker Test Network
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
cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh
- name: Cache Docker Volumes
uses: actions/cache@v5
with:
Expand Down
8 changes: 8 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ volumes:
ubuntu-ccache:
name: ${ARCH}-ubuntu-${UBUNTU}-ccache

networks:
# GH-48068 for Flight SQL ODBC Testing
odbc_net:
external: true

services:

################################# C++ #######################################
Expand Down Expand Up @@ -509,6 +514,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_GANDIVA: "OFF"
ARROW_GCS: "OFF"
ARROW_HDFS: "OFF"
Expand All @@ -517,6 +523,8 @@ services:
ARROW_S3: "OFF"
ARROW_SUBSTRAIT: "OFF"
# Register ODBC before running tests
networks:
- odbc_net
command: >
/bin/bash -c "
/arrow/ci/scripts/cpp_build.sh /arrow /build &&
Expand Down
39 changes: 39 additions & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/dremio/docker-compose.yml
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we can't keep this in the same compose file as everything else?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you compose.yaml because it's the preferred file name?
See also: #47806

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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.

networks:
odbc_net:
external: true

services:
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
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you enable pre-commit hooks for this file?

Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# 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.

#!/bin/bash
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move the shebang to the first line?

set -e

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"

# Wait for Dremio to be available.
until curl -s "$NEW_USER_URL"; do
echo 'Waiting for Dremio to start...'
sleep 5
done

echo ""
echo 'Creating admin user...'

# Create new admin account.
curl -X PUT "$NEW_USER_URL" \
-H "Content-Type: application/json" \
-d "{ \"userName\": \"$ADMIN_USER\", \"password\": \"$ADMIN_PASSWORD\" }"

echo ""
echo "Created admin user."

# Use admin account to login and acquire a token.
TOKEN=$(curl -s -X POST "$LOGIN_URL" \
-H "Content-Type: application/json" \
-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;"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about format this for easy to read?

Suggested change
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;"
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')

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\"}"

echo ""
echo "Finished setting up dremio docker instance."
Loading