Skip to content

[pull] main from apache:main #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Apr 1, 2026
Merged

[pull] main from apache:main #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fee90be
Misc minor optimizations to query optimizer performance (#21128)
AdamGS Mar 31, 2026
e75ed5b
feat(sql): unparse array_has as ANY for Postgres (#20654)
vimeh Mar 31, 2026
f3e8291
chore(deps): bump the all-other-cargo-deps group across 1 directory w…
dependabot[bot] Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 67 additions & 52 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ half = { version = "2.7.0", default-features = false }
hashbrown = { version = "0.16.1" }
hex = { version = "0.4.3" }
indexmap = "2.13.0"
insta = { version = "1.46.3", features = ["glob", "filters"] }
insta = { version = "1.47.2", features = ["glob", "filters"] }
itertools = "0.14"
itoa = "1.0"
liblzma = { version = "0.4.6", features = ["static"] }
Expand Down Expand Up @@ -196,7 +196,7 @@ tokio = { version = "1.48", features = ["macros", "rt", "sync"] }
tokio-stream = "0.1"
tokio-util = "0.7"
url = "2.5.7"
uuid = "1.21"
uuid = "1.23"
zstd = { version = "0.13", default-features = false }

[workspace.lints.clippy]
Expand Down
2 changes: 1 addition & 1 deletion datafusion/functions/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ num-traits = { workspace = true }
rand = { workspace = true }
regex = { workspace = true, optional = true }
sha2 = { workspace = true, optional = true }
unicode-segmentation = { version = "^1.7.1", optional = true }
unicode-segmentation = { version = "^1.13.2", optional = true }
uuid = { workspace = true, features = ["v4"], optional = true }

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions datafusion/optimizer/src/analyzer/type_coercion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
use arrow::compute::can_cast_types;
use datafusion_expr::binary::BinaryTypeCoercer;
use itertools::{Itertools as _, izip};
use std::sync::Arc;
use std::sync::{Arc, LazyLock};

use crate::analyzer::AnalyzerRule;
use crate::utils::NamePreserver;
Expand Down Expand Up @@ -91,11 +91,11 @@ impl AnalyzerRule for TypeCoercion {
}

fn analyze(&self, plan: LogicalPlan, config: &ConfigOptions) -> Result<LogicalPlan> {
let empty_schema = DFSchema::empty();
static EMPTY_SCHEMA: LazyLock<DFSchema> = LazyLock::new(DFSchema::empty);

// recurse
let transformed_plan = plan
.transform_up_with_subqueries(|plan| analyze_internal(&empty_schema, plan))?
.transform_up_with_subqueries(|plan| analyze_internal(&EMPTY_SCHEMA, plan))?
.data;

// finish
Expand Down
6 changes: 1 addition & 5 deletions datafusion/optimizer/src/common_subexpr_eliminate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,7 @@ impl CommonSubexprEliminate {
.map(|expr| Some(name_preserver.save(expr)))
.collect::<Vec<_>>()
} else {
new_aggr_expr
.clone()
.into_iter()
.map(|_| None)
.collect::<Vec<_>>()
(0..new_aggr_expr.len()).map(|_| None).collect()
};

let mut agg_exprs = common_exprs
Expand Down
Loading
Loading