mirror of
https://github.com/langchain-ai/datafusion.git
synced 2026-06-30 21:27:59 -04:00
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
This commit is contained in:
@@ -1515,7 +1515,9 @@ impl ExecutionPlan for AggregateExec {
|
||||
|
||||
// If this node tried to pushdown some dynamic filter before, now we check
|
||||
// if the child accept the filter
|
||||
if matches!(phase, FilterPushdownPhase::Post) && self.dynamic_filter.is_some() {
|
||||
if matches!(phase, FilterPushdownPhase::Post)
|
||||
&& let Some(dyn_filter) = &self.dynamic_filter
|
||||
{
|
||||
// let child_accepts_dyn_filter = child_pushdown_result
|
||||
// .self_filters
|
||||
// .first()
|
||||
@@ -1536,7 +1538,6 @@ impl ExecutionPlan for AggregateExec {
|
||||
// So here, we try to use ref count to determine if the dynamic filter
|
||||
// has actually be pushed down.
|
||||
// Issue: <https://github.com/apache/datafusion/issues/18856>
|
||||
let dyn_filter = self.dynamic_filter.as_ref().unwrap();
|
||||
let child_accepts_dyn_filter = Arc::strong_count(dyn_filter) > 1;
|
||||
|
||||
if !child_accepts_dyn_filter {
|
||||
|
||||
@@ -1529,7 +1529,9 @@ impl SortMergeJoinStream {
|
||||
|
||||
// Prepare the columns we apply join filter on later.
|
||||
// Only for joined rows between streamed and buffered.
|
||||
let filter_columns = if chunk.buffered_batch_idx.is_some() {
|
||||
let filter_columns = if let Some(buffered_batch_idx) =
|
||||
chunk.buffered_batch_idx
|
||||
{
|
||||
if !matches!(self.join_type, JoinType::Right) {
|
||||
if matches!(
|
||||
self.join_type,
|
||||
@@ -1537,7 +1539,7 @@ impl SortMergeJoinStream {
|
||||
) {
|
||||
let right_cols = fetch_right_columns_by_idxs(
|
||||
&self.buffered_data,
|
||||
chunk.buffered_batch_idx.unwrap(),
|
||||
buffered_batch_idx,
|
||||
&right_indices,
|
||||
)?;
|
||||
|
||||
@@ -1548,7 +1550,7 @@ impl SortMergeJoinStream {
|
||||
) {
|
||||
let right_cols = fetch_right_columns_by_idxs(
|
||||
&self.buffered_data,
|
||||
chunk.buffered_batch_idx.unwrap(),
|
||||
buffered_batch_idx,
|
||||
&right_indices,
|
||||
)?;
|
||||
|
||||
|
||||
+1
-1
@@ -19,5 +19,5 @@
|
||||
# to compile this workspace and run CI jobs.
|
||||
|
||||
[toolchain]
|
||||
channel = "1.92.0"
|
||||
channel = "1.93.0"
|
||||
components = ["rustfmt", "clippy"]
|
||||
|
||||
Reference in New Issue
Block a user