Skip to content

Commit 64fc038

Browse files
authored
Merge branch 'main' into revive_to_use_upstream_arrow_coalesce
2 parents bac0197 + ab794d2 commit 64fc038

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

Cargo.lock

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

datafusion-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ arrow = { workspace = true }
3939
async-trait = { workspace = true }
4040
aws-config = "1.8.3"
4141
aws-credential-types = "1.2.5"
42-
clap = { version = "4.5.41", features = ["derive", "cargo"] }
42+
clap = { version = "4.5.43", features = ["derive", "cargo"] }
4343
datafusion = { workspace = true, features = [
4444
"avro",
4545
"crypto_expressions",

datafusion/physical-expr/src/scalar_function.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,12 @@ impl Hash for ScalarFunctionExpr {
203203
name,
204204
args,
205205
return_field,
206-
config_options,
206+
config_options: _, // expensive to hash, and often equal
207207
} = self;
208208
fun.hash(state);
209209
name.hash(state);
210210
args.hash(state);
211211
return_field.hash(state);
212-
sorted_config_entries(config_options).hash(state);
213212
}
214213
}
215214

datafusion/sqllogictest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ async-trait = { workspace = true }
4242
bigdecimal = { workspace = true }
4343
bytes = { workspace = true, optional = true }
4444
chrono = { workspace = true, optional = true }
45-
clap = { version = "4.5.41", features = ["derive", "env"] }
45+
clap = { version = "4.5.43", features = ["derive", "env"] }
4646
datafusion = { workspace = true, default-features = true, features = ["avro"] }
4747
datafusion-spark = { workspace = true, default-features = true }
4848
datafusion-substrait = { workspace = true, default-features = true }

0 commit comments

Comments
 (0)