Skip to content

Commit 3a57701

Browse files
committed
Merge remote-tracking branch 'apache/main' into alamb/backport_instructions
2 parents 54e2ce6 + 878b879 commit 3a57701

File tree

236 files changed

+4276
-1735
lines changed

Some content is hidden

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

236 files changed

+4276
-1735
lines changed

.github/workflows/extended.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ jobs:
173173
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
174174
submodules: true
175175
fetch-depth: 1
176-
- name: Setup Rust toolchain
177-
uses: ./.github/actions/setup-builder
178-
with:
179-
rust-version: stable
176+
# Don't use setup-builder to avoid configuring RUST_BACKTRACE which is expensive
177+
- name: Install protobuf compiler
178+
run: |
179+
apt-get update && apt-get install -y protobuf-compiler
180180
- name: Run sqllogictest
181181
run: |
182182
cargo test --features backtrace,parquet_encryption --profile ci-optimized --test sqllogictests -- --include-sqlite

AGENTS.md

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,22 @@
22

33
## Developer Documentation
44

5+
- [Quick Start Setup](docs/source/contributor-guide/development_environment.md#quick-start)
6+
- [Testing Quick Start](docs/source/contributor-guide/testing.md#testing-quick-start)
7+
- [Before Submitting a PR](docs/source/contributor-guide/index.md#before-submitting-a-pr)
58
- [Contributor Guide](docs/source/contributor-guide/index.md)
69
- [Architecture Guide](docs/source/contributor-guide/architecture.md)
710

811
## Before Committing
912

10-
Before committing any changes, you **must** run the following checks and fix any issues:
13+
Before committing any changes, you MUST follow the instructions in
14+
[Before Submitting a PR](docs/source/contributor-guide/index.md#before-submitting-a-pr)
15+
and ensure the required checks listed there pass. Do not commit code that
16+
fails any of those checks.
1117

12-
```bash
13-
cargo fmt --all
14-
cargo clippy --all-targets --all-features -- -D warnings
15-
```
16-
17-
- `cargo fmt` ensures consistent code formatting across the project.
18-
- `cargo clippy` catches common mistakes and enforces idiomatic Rust patterns. All warnings must be resolved (treated as errors via `-D warnings`).
19-
20-
Do not commit code that fails either of these checks.
18+
When creating a PR, you MUST follow the [PR template](.github/pull_request_template.md).
2119

2220
## Testing
2321

24-
Run relevant tests before submitting changes:
25-
26-
```bash
27-
cargo test --all-features
28-
```
29-
30-
For SQL logic tests:
31-
32-
```bash
33-
cargo test -p datafusion-sqllogictest
34-
```
22+
See the [Testing Quick Start](docs/source/contributor-guide/testing.md#testing-quick-start)
23+
for the recommended pre-PR test commands.

Cargo.lock

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/catalog-listing/src/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ mod tests {
462462
use std::ops::Not;
463463

464464
use super::*;
465-
use datafusion_expr::{Expr, case, col, lit};
465+
use datafusion_expr::{case, col};
466466

467467
#[test]
468468
fn test_split_files() {

datafusion/catalog-listing/src/table.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,6 @@ mod tests {
920920
use arrow::compute::SortOptions;
921921
use datafusion_physical_expr::expressions::Column;
922922
use datafusion_physical_expr_common::sort_expr::PhysicalSortExpr;
923-
use std::sync::Arc;
924923

925924
/// Helper to create a PhysicalSortExpr
926925
fn sort_expr(

datafusion/catalog/src/table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ pub trait TableProviderFactory: Debug + Sync + Send {
486486
}
487487

488488
/// A trait for table function implementations
489-
pub trait TableFunctionImpl: Debug + Sync + Send {
489+
pub trait TableFunctionImpl: Debug + Sync + Send + Any {
490490
/// Create a table provider
491491
fn call(&self, args: &[Expr]) -> Result<Arc<dyn TableProvider>>;
492492
}

datafusion/common/src/config.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,12 @@ config_namespace! {
10881088
/// process to reorder the join keys
10891089
pub top_down_join_key_reordering: bool, default = true
10901090

1091+
/// When set to true, the physical plan optimizer may swap join inputs
1092+
/// based on statistics. When set to false, statistics-driven join
1093+
/// input reordering is disabled and the original join order in the
1094+
/// query is used.
1095+
pub join_reordering: bool, default = true
1096+
10911097
/// When set to true, the physical plan optimizer will prefer HashJoin over SortMergeJoin.
10921098
/// HashJoin can work more efficiently than SortMergeJoin but consumes more memory
10931099
pub prefer_hash_join: bool, default = true

0 commit comments

Comments
 (0)