Skip to content

Commit ba267ac

Browse files
authored
build: update Rust toolchain version from 1.92.0 to 1.93.0 in rust-toolchain.toml (#20309)
just an update of the rust toolchain
1 parent b7f6090 commit ba267ac

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

datafusion/physical-plan/src/aggregates/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,9 @@ impl ExecutionPlan for AggregateExec {
15151515

15161516
// If this node tried to pushdown some dynamic filter before, now we check
15171517
// if the child accept the filter
1518-
if matches!(phase, FilterPushdownPhase::Post) && self.dynamic_filter.is_some() {
1518+
if matches!(phase, FilterPushdownPhase::Post)
1519+
&& let Some(dyn_filter) = &self.dynamic_filter
1520+
{
15191521
// let child_accepts_dyn_filter = child_pushdown_result
15201522
// .self_filters
15211523
// .first()
@@ -1536,7 +1538,6 @@ impl ExecutionPlan for AggregateExec {
15361538
// So here, we try to use ref count to determine if the dynamic filter
15371539
// has actually be pushed down.
15381540
// Issue: <https://github.com/apache/datafusion/issues/18856>
1539-
let dyn_filter = self.dynamic_filter.as_ref().unwrap();
15401541
let child_accepts_dyn_filter = Arc::strong_count(dyn_filter) > 1;
15411542

15421543
if !child_accepts_dyn_filter {

datafusion/physical-plan/src/joins/sort_merge_join/stream.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,15 +1529,17 @@ impl SortMergeJoinStream {
15291529

15301530
// Prepare the columns we apply join filter on later.
15311531
// Only for joined rows between streamed and buffered.
1532-
let filter_columns = if chunk.buffered_batch_idx.is_some() {
1532+
let filter_columns = if let Some(buffered_batch_idx) =
1533+
chunk.buffered_batch_idx
1534+
{
15331535
if !matches!(self.join_type, JoinType::Right) {
15341536
if matches!(
15351537
self.join_type,
15361538
JoinType::LeftSemi | JoinType::LeftAnti | JoinType::LeftMark
15371539
) {
15381540
let right_cols = fetch_right_columns_by_idxs(
15391541
&self.buffered_data,
1540-
chunk.buffered_batch_idx.unwrap(),
1542+
buffered_batch_idx,
15411543
&right_indices,
15421544
)?;
15431545

@@ -1548,7 +1550,7 @@ impl SortMergeJoinStream {
15481550
) {
15491551
let right_cols = fetch_right_columns_by_idxs(
15501552
&self.buffered_data,
1551-
chunk.buffered_batch_idx.unwrap(),
1553+
buffered_batch_idx,
15521554
&right_indices,
15531555
)?;
15541556

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
# to compile this workspace and run CI jobs.
2020

2121
[toolchain]
22-
channel = "1.92.0"
22+
channel = "1.93.0"
2323
components = ["rustfmt", "clippy"]

0 commit comments

Comments
 (0)