Skip to content

Commit 26bc9ee

Browse files
committed
Merge branch 'main' into extend-interval-analysis-temporal
2 parents 9c50e6d + 02e4411 commit 26bc9ee

Some content is hidden

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

63 files changed

+5645
-563
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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
45+
uses: taiki-e/install-action@94cb46f8d6e437890146ffbd78a778b78e623fb2 # v2.74.0
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ jobs:
430430
sudo apt-get update -qq
431431
sudo apt-get install -y -qq clang
432432
- name: Setup wasm-pack
433-
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
433+
uses: taiki-e/install-action@94cb46f8d6e437890146ffbd78a778b78e623fb2 # v2.74.0
434434
with:
435435
tool: wasm-pack
436436
- name: Run tests with headless mode
@@ -770,7 +770,7 @@ jobs:
770770
- name: Setup Rust toolchain
771771
uses: ./.github/actions/setup-builder
772772
- name: Install cargo-msrv
773-
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
773+
uses: taiki-e/install-action@94cb46f8d6e437890146ffbd78a778b78e623fb2 # v2.74.0
774774
with:
775775
tool: cargo-msrv
776776

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ glob = "0.3.0"
162162
half = { version = "2.7.0", default-features = false }
163163
hashbrown = { version = "0.16.1" }
164164
hex = { version = "0.4.3" }
165-
indexmap = "2.13.0"
165+
indexmap = "2.13.1"
166166
insta = { version = "1.47.2", features = ["glob", "filters"] }
167167
itertools = "0.14"
168168
itoa = "1.0"
@@ -192,7 +192,7 @@ strum = "0.28.0"
192192
strum_macros = "0.28.0"
193193
tempfile = "3"
194194
testcontainers-modules = { version = "0.15" }
195-
tokio = { version = "1.48", features = ["macros", "rt", "sync"] }
195+
tokio = { version = "1.51", features = ["macros", "rt", "sync"] }
196196
tokio-stream = "0.1"
197197
tokio-util = "0.7"
198198
url = "2.5.7"

datafusion/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ hashbrown = { workspace = true }
7575
hex = { workspace = true, optional = true }
7676
indexmap = { workspace = true }
7777
itertools = { workspace = true }
78-
libc = "0.2.180"
78+
libc = "0.2.184"
7979
log = { workspace = true }
8080
object_store = { workspace = true, optional = true }
8181
parquet = { workspace = true, optional = true, default-features = true }

datafusion/common/src/config.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,19 @@ config_namespace! {
557557
/// batches and merged.
558558
pub sort_in_place_threshold_bytes: usize, default = 1024 * 1024
559559

560+
/// Maximum buffer capacity (in bytes) per partition for BufferExec
561+
/// inserted during sort pushdown optimization.
562+
///
563+
/// When PushdownSort eliminates a SortExec under SortPreservingMergeExec,
564+
/// a BufferExec is inserted to replace SortExec's buffering role. This
565+
/// prevents I/O stalls by allowing the scan to run ahead of the merge.
566+
///
567+
/// This uses strictly less memory than the SortExec it replaces (which
568+
/// buffers the entire partition). The buffer respects the global memory
569+
/// pool limit. Setting this to a large value is safe — actual memory
570+
/// usage is bounded by partition size and global memory limits.
571+
pub sort_pushdown_buffer_capacity: usize, default = 1024 * 1024 * 1024
572+
560573
/// Maximum size in bytes for individual spill files before rotating to a new file.
561574
///
562575
/// When operators spill data to disk (e.g., RepartitionExec), they write

datafusion/core/tests/dataframe/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,9 +2458,8 @@ async fn cache_producer_test() -> Result<()> {
24582458
@r"
24592459
CacheNode
24602460
Projection: aggregate_test_100.c2, aggregate_test_100.c3, CAST(CAST(aggregate_test_100.c2 AS Int64) + CAST(aggregate_test_100.c3 AS Int64) AS Int64) AS sum
2461-
Projection: aggregate_test_100.c2, aggregate_test_100.c3
2462-
Limit: skip=0, fetch=1
2463-
TableScan: aggregate_test_100, fetch=1
2461+
Limit: skip=0, fetch=1
2462+
TableScan: aggregate_test_100 projection=[c2, c3], fetch=1
24642463
"
24652464
);
24662465
Ok(())

0 commit comments

Comments
 (0)