Skip to content

Commit 6945c76

Browse files
committed
Merge remote-tracking branch 'apache/main' into alamb/features2
2 parents e31b779 + e4bf951 commit 6945c76

File tree

95 files changed

+4338
-2308
lines changed

Some content is hidden

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

95 files changed

+4338
-2308
lines changed

.asf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ notifications:
2424
commits: commits@datafusion.apache.org
2525
issues: github@datafusion.apache.org
2626
pullrequests: github@datafusion.apache.org
27+
discussions: github@datafusion.apache.org
2728
jira_options: link label worklog
2829
github:
2930
description: "Apache DataFusion SQL Query Engine"
@@ -44,6 +45,7 @@ github:
4445
rebase: false
4546
features:
4647
issues: true
48+
discussions: true
4749
protected_branches:
4850
main:
4951
required_pull_request_reviews:

.github/workflows/rust.yml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253
- name: Check datafusion-functions (unicode_expressions)
254254
run: cargo check --profile ci --no-default-features -p datafusion-functions --features=unicode_expressions
255255

256-
# Run tests
256+
# Library and integration tests
257257
linux-test:
258258
name: cargo test (amd64)
259259
needs: linux-build-lib
@@ -267,6 +267,36 @@ jobs:
267267
run: rustup toolchain install stable
268268
- name: Install Protobuf Compiler
269269
run: sudo apt-get install -y protobuf-compiler
270+
- name: Run tests (excluding doctests and datafusion-cli)
271+
env:
272+
RUST_BACKTRACE: 1
273+
run: |
274+
cargo test \
275+
--profile ci \
276+
--exclude datafusion-examples \
277+
--exclude ffi_example_table_provider \
278+
--exclude datafusion-benchmarks \
279+
--exclude datafusion-cli \
280+
--workspace \
281+
--lib \
282+
--tests \
283+
--bins \
284+
--features serde,avro,json,backtrace,integration-tests
285+
- name: Verify Working Directory Clean
286+
run: git diff --exit-code
287+
288+
# datafusion-cli tests
289+
linux-test-datafusion-cli:
290+
name: cargo test datafusion-cli (amd64)
291+
needs: linux-build-lib
292+
runs-on: ubuntu-latest
293+
steps:
294+
- uses: actions/checkout@v4
295+
with:
296+
submodules: true
297+
fetch-depth: 1
298+
- name: Setup Rust toolchain
299+
run: rustup toolchain install stable
270300
- name: Setup Minio - S3-compatible storage
271301
run: |
272302
docker run -d --name minio-container \
@@ -287,13 +317,14 @@ jobs:
287317
AWS_SECRET_ACCESS_KEY: TEST-DataFusionPassword
288318
TEST_STORAGE_INTEGRATION: 1
289319
AWS_ALLOW_HTTP: true
290-
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
320+
run: cargo test --profile ci -p datafusion-cli --lib --tests --bins
291321
- name: Verify Working Directory Clean
292322
run: git diff --exit-code
293323
- name: Minio Output
294324
if: ${{ !cancelled() }}
295325
run: docker logs minio-container
296326

327+
297328
linux-test-example:
298329
name: cargo examples (amd64)
299330
needs: linux-build-lib
@@ -495,7 +526,7 @@ jobs:
495526
uses: ./.github/actions/setup-macos-aarch64-builder
496527
- name: Run tests (excluding doctests)
497528
shell: bash
498-
run: cargo test --profile ci --lib --tests --bins --features avro,json,backtrace,integration-tests
529+
run: cargo test --profile ci --exclude datafusion-cli --workspace --lib --tests --bins --features avro,json,backtrace,integration-tests
499530

500531
test-datafusion-pyarrow:
501532
name: cargo test pyarrow (amd64)

0 commit comments

Comments
 (0)