Skip to content

Commit b2e9eb1

Browse files
committed
Merge remote-tracking branch 'origin/main' into arrow-avro
# Conflicts: # datafusion/datasource-avro/src/source.rs
2 parents 3014b8a + 1988ffc commit b2e9eb1

File tree

256 files changed

+9582
-3267
lines changed

Some content is hidden

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

256 files changed

+9582
-3267
lines changed

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
45+
uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/extended.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
--lib \
125125
--tests \
126126
--bins \
127-
--features avro,json,backtrace,extended_tests,recursive_protection
127+
--features avro,json,backtrace,extended_tests,recursive_protection,parquet_encryption
128128
- name: Verify Working Directory Clean
129129
run: git diff --exit-code
130130
- name: Cleanup
@@ -169,7 +169,7 @@ jobs:
169169
rust-version: stable
170170
- name: Run sqllogictest
171171
run: |
172-
cargo test --features backtrace --profile release-nonlto --test sqllogictests -- --include-sqlite
172+
cargo test --features backtrace,parquet_encryption --profile release-nonlto --test sqllogictests -- --include-sqlite
173173
cargo clean
174174
175175

.github/workflows/rust.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ jobs:
434434
sudo apt-get update -qq
435435
sudo apt-get install -y -qq clang
436436
- name: Setup wasm-pack
437-
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
437+
uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
438438
with:
439439
tool: wasm-pack
440440
- name: Run tests with headless mode
@@ -475,7 +475,7 @@ jobs:
475475
export RUST_MIN_STACK=20971520
476476
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
477477
cargo test plan_q --package datafusion-benchmarks --profile ci --features=ci -- --test-threads=1
478-
INCLUDE_TPCH=true cargo test --features backtrace --profile ci --package datafusion-sqllogictest --test sqllogictests
478+
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption --profile ci --package datafusion-sqllogictest --test sqllogictests
479479
- name: Verify Working Directory Clean
480480
run: git diff --exit-code
481481

@@ -761,7 +761,7 @@ jobs:
761761
- name: Setup Rust toolchain
762762
uses: ./.github/actions/setup-builder
763763
- name: Install cargo-msrv
764-
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
764+
uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
765765
with:
766766
tool: cargo-msrv
767767

0 commit comments

Comments
 (0)