Skip to content

Commit 1001bad

Browse files
authored
Merge branch 'main' into fix/window_function
2 parents dd07329 + 14ce193 commit 1001bad

File tree

160 files changed

+6082
-2181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+6082
-2181
lines changed

.github/workflows/extended.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
rust-version: stable
125125
- name: Run sqllogictest
126126
run: |
127-
cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
127+
cargo test --features backtrace --profile release-nonlto --test sqllogictests -- --include-sqlite
128128
cargo clean
129129
130130

.github/workflows/rust.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,41 @@ jobs:
171171
name: cargo test (amd64)
172172
needs: linux-build-lib
173173
runs-on: ubuntu-latest
174-
container:
175-
image: amd64/rust
176174
steps:
177175
- uses: actions/checkout@v4
178176
with:
179177
submodules: true
180178
fetch-depth: 1
181179
- name: Setup Rust toolchain
182-
uses: ./.github/actions/setup-builder
183-
with:
184-
rust-version: stable
180+
run: rustup toolchain install stable
181+
- name: Install Protobuf Compiler
182+
run: sudo apt-get install -y protobuf-compiler
183+
- name: Setup Minio - S3-compatible storage
184+
run: |
185+
docker run -d --name minio-container \
186+
-p 9000:9000 \
187+
-e MINIO_ROOT_USER=TEST-DataFusionLogin -e MINIO_ROOT_PASSWORD=TEST-DataFusionPassword \
188+
-v $(pwd)/datafusion/core/tests/data:/source quay.io/minio/minio \
189+
server /data
190+
docker exec minio-container /bin/sh -c "\
191+
mc ready local
192+
mc alias set localminio http://localhost:9000 TEST-DataFusionLogin TEST-DataFusionPassword && \
193+
mc mb localminio/data && \
194+
mc cp -r /source/* localminio/data"
185195
- name: Run tests (excluding doctests)
196+
env:
197+
RUST_BACKTRACE: 1
198+
AWS_ENDPOINT: http://127.0.0.1:9000
199+
AWS_ACCESS_KEY_ID: TEST-DataFusionLogin
200+
AWS_SECRET_ACCESS_KEY: TEST-DataFusionPassword
201+
TEST_STORAGE_INTEGRATION: 1
202+
AWS_ALLOW_HTTP: true
186203
run: cargo test --profile ci --exclude datafusion-examples --exclude ffi_example_table_provider --exclude datafusion-benchmarks --workspace --lib --tests --bins --features avro,json,backtrace,integration-tests
187204
- name: Verify Working Directory Clean
188205
run: git diff --exit-code
206+
- name: Minio Output
207+
if: ${{ !cancelled() }}
208+
run: docker logs minio-container
189209

190210
linux-test-example:
191211
name: cargo examples (amd64)
@@ -259,6 +279,10 @@ jobs:
259279
uses: ./.github/actions/setup-builder
260280
with:
261281
rust-version: stable
282+
- name: Install dependencies
283+
run: |
284+
apt-get update -qq
285+
apt-get install -y -qq clang
262286
- name: Install wasm-pack
263287
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
264288
- name: Build with wasm-pack
@@ -295,7 +319,7 @@ jobs:
295319
export RUST_MIN_STACK=20971520
296320
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
297321
cargo test plan_q --package datafusion-benchmarks --profile ci --features=ci -- --test-threads=1
298-
INCLUDE_TPCH=true cargo test --profile ci --package datafusion-sqllogictest --test sqllogictests
322+
INCLUDE_TPCH=true cargo test --features backtrace --profile ci --package datafusion-sqllogictest --test sqllogictests
299323
- name: Verify Working Directory Clean
300324
run: git diff --exit-code
301325

@@ -331,7 +355,7 @@ jobs:
331355
- name: Run sqllogictest
332356
run: |
333357
cd datafusion/sqllogictest
334-
PG_COMPAT=true PG_URI="postgresql://postgres:postgres@$POSTGRES_HOST:$POSTGRES_PORT/db_test" cargo test --profile ci --features=postgres --test sqllogictests
358+
PG_COMPAT=true PG_URI="postgresql://postgres:postgres@$POSTGRES_HOST:$POSTGRES_PORT/db_test" cargo test --features backtrace --profile ci --features=postgres --test sqllogictests
335359
env:
336360
# use postgres for the host here because we have specified a container for the job
337361
POSTGRES_HOST: postgres

0 commit comments

Comments
 (0)