Skip to content

Commit cea1b11

Browse files
authored
Merge branch 'main' into dfschema-name-index
2 parents 8df0e2d + 3985bd5 commit cea1b11

106 files changed

Lines changed: 4017 additions & 1828 deletions

File tree

Some content is hidden

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

‎.asf.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ github:
104104
branch-54:
105105
required_pull_request_reviews:
106106
required_approving_review_count: 1
107+
branch-55:
108+
required_pull_request_reviews:
109+
required_approving_review_count: 1
107110
pull_requests:
108111
# enable updating head branches of pull requests
109112
allow_update_branch: true

‎.github/dependabot.yml‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,33 @@ updates:
6262
update-types:
6363
- "minor"
6464
- "patch"
65+
# dev/depcheck is a standalone crate excluded from the workspace, so it is
66+
# not covered by the workspace entry above
67+
- package-ecosystem: cargo
68+
directory: "/dev/depcheck"
69+
schedule:
70+
interval: weekly
71+
target-branch: main
72+
labels: [auto-dependencies]
73+
# the wasm test app has its own npm lockfile
74+
- package-ecosystem: npm
75+
directory: "/datafusion/wasmtest/datafusion-wasm-app"
76+
schedule:
77+
interval: weekly
78+
labels: [auto-dependencies]
79+
groups:
80+
# minor and patch bumps are grouped into a single PR
81+
all-npm-deps:
82+
applies-to: version-updates
83+
patterns:
84+
- "*"
85+
update-types:
86+
- "minor"
87+
- "patch"
6588
- package-ecosystem: "github-actions"
66-
directory: "/"
89+
# "/" covers workflows in .github/workflows; the glob covers composite
90+
# actions such as .github/actions/setup-builder
91+
directories: ["/", "/.github/actions/*"]
6792
schedule:
6893
interval: "weekly"
6994
open-pull-requests-limit: 10
@@ -72,8 +97,10 @@ updates:
7297
codeql-actions:
7398
patterns:
7499
- "github/codeql-action/*"
75-
- package-ecosystem: "pip"
76-
directory: "/docs"
100+
# Python dependencies are managed as a uv workspace rooted at the top-level
101+
# pyproject.toml with a shared uv.lock
102+
- package-ecosystem: "uv"
103+
directory: "/"
77104
schedule:
78105
interval: "weekly"
79106
labels: [auto-dependencies]

‎Cargo.toml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,20 +210,71 @@ uuid = "1.23"
210210
zstd = { version = "0.13", default-features = false }
211211

212212
# Keep this list sorted alphabetically.
213+
# See https://github.com/apache/datafusion/issues/18467 for the ongoing effort of
214+
# picking useful non-default lints.
213215
[workspace.lints.clippy]
214216
# https://github.com/apache/datafusion/issues/18881
215217
allow_attributes = "warn"
218+
as_ptr_cast_mut = "warn"
216219
assigning_clones = "warn"
220+
clear_with_drain = "warn"
221+
coerce_container_to_any = "warn"
222+
debug_assert_with_mut_call = "warn"
223+
decimal_bitwise_operands = "warn"
224+
default_union_representation = "warn"
225+
doc_include_without_cfg = "warn"
226+
empty_enum_variants_with_brackets = "warn"
227+
exit = "warn"
228+
flat_map_option = "warn"
229+
fn_to_numeric_cast_any = "warn"
230+
imprecise_flops = "warn"
231+
index_refutable_slice = "warn"
217232
inefficient_to_string = "warn"
233+
infinite_loop = "warn"
234+
invalid_upcast_comparisons = "warn"
235+
ip_constant = "warn"
236+
iter_filter_is_ok = "warn"
237+
iter_filter_is_some = "warn"
238+
iter_on_empty_collections = "warn"
218239
# Detects large stack-allocated futures that may cause stack overflow crashes (see threshold in clippy.toml)
219240
large_futures = "warn"
241+
large_include_file = "warn"
242+
macro_use_imports = "warn"
243+
manual_ilog2 = "warn"
244+
manual_instant_elapsed = "warn"
245+
manual_is_power_of_two = "warn"
246+
match_wild_err_arm = "warn"
247+
mem_forget = "warn"
248+
mismatching_type_param_order = "warn"
249+
mut_mut = "warn"
220250
# https://github.com/apache/datafusion/issues/18503
221251
needless_pass_by_value = "warn"
252+
negative_feature_names = "warn"
253+
non_zero_suggestions = "warn"
254+
nonstandard_macro_braces = "warn"
222255
or_fun_call = "warn"
256+
path_buf_push_overwrite = "warn"
257+
pathbuf_init_then_push = "warn"
258+
precedence_bits = "warn"
259+
pub_underscore_fields = "warn"
260+
rc_mutex = "warn"
261+
ref_option_ref = "warn"
262+
same_length_and_capacity = "warn"
263+
str_split_at_newline = "warn"
264+
string_add_assign = "warn"
265+
suspicious_xor_used_as_pow = "warn"
266+
trailing_empty_array = "warn"
267+
transmute_ptr_to_ptr = "warn"
268+
uninhabited_references = "warn"
223269
uninlined_format_args = "warn"
224270
unnecessary_lazy_evaluations = "warn"
271+
unnecessary_self_imports = "warn"
225272
unused_async = "warn"
273+
unused_rounding = "warn"
226274
used_underscore_binding = "warn"
275+
verbose_file_reads = "warn"
276+
wildcard_dependencies = "warn"
277+
zero_sized_map_values = "warn"
227278

228279
[workspace.lints.rust]
229280
unexpected_cfgs = { level = "warn", check-cfg = [

‎benchmarks/src/clickbench.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ pub struct RunOpt {
111111

112112
/// Get the SQL file path
113113
pub fn get_query_path(query_dir: &Path, query: usize) -> PathBuf {
114-
let mut query_path = query_dir.to_path_buf();
115-
query_path.push(format!("q{query}.sql"));
116-
query_path
114+
query_dir.join(format!("q{query}.sql"))
117115
}
118116

119117
/// Get the SQL statement from the specified query file

‎datafusion-cli/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
html_favicon_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg"
2121
)]
2222
#![cfg_attr(docsrs, feature(doc_cfg))]
23-
#![doc = include_str!("../README.md")]
23+
#![cfg_attr(doc, doc = include_str!("../README.md"))]
2424
pub const DATAFUSION_CLI_VERSION: &str = env!("CARGO_PKG_VERSION");
2525

2626
pub mod catalog;

‎datafusion-examples/examples/custom_data_source/custom_datasource.rs‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ use datafusion::physical_expr::EquivalenceProperties;
3636
use datafusion::physical_plan::execution_plan::{Boundedness, EmissionType};
3737
use datafusion::physical_plan::memory::MemoryStream;
3838
use datafusion::physical_plan::{
39-
DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning, PlanProperties,
40-
SendableRecordBatchStream, project_schema,
39+
ChildrenPropertiesMode, DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning,
40+
PlanProperties, ReplaceChildrenOptions, SendableRecordBatchStream, project_schema,
4141
};
4242
use datafusion::prelude::*;
4343

@@ -268,13 +268,24 @@ impl ExecutionPlan for CustomExec {
268268
vec![]
269269
}
270270

271-
fn with_new_children(
271+
fn replace_children(
272272
self: Arc<Self>,
273273
_: Vec<Arc<dyn ExecutionPlan>>,
274+
_: ReplaceChildrenOptions,
274275
) -> Result<Arc<dyn ExecutionPlan>> {
275276
Ok(self)
276277
}
277278

279+
fn with_new_children(
280+
self: Arc<Self>,
281+
children: Vec<Arc<dyn ExecutionPlan>>,
282+
) -> Result<Arc<dyn ExecutionPlan>> {
283+
self.replace_children(
284+
children,
285+
ReplaceChildrenOptions::new(ChildrenPropertiesMode::Recompute),
286+
)
287+
}
288+
278289
fn execute(
279290
&self,
280291
_partition: usize,

‎datafusion-examples/examples/execution_monitoring/memory_pool_execution_plan.rs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ use datafusion::execution::{SendableRecordBatchStream, TaskContext};
3939
use datafusion::logical_expr::LogicalPlanBuilder;
4040
use datafusion::physical_plan::stream::RecordBatchStreamAdapter;
4141
use datafusion::physical_plan::{
42-
DisplayAs, DisplayFormatType, ExecutionPlan, PlanProperties,
42+
ChildrenPropertiesMode, DisplayAs, DisplayFormatType, ExecutionPlan, PlanProperties,
43+
ReplaceChildrenOptions,
4344
};
4445
use datafusion::prelude::*;
4546
use futures::stream::{StreamExt, TryStreamExt};
@@ -237,9 +238,10 @@ impl ExecutionPlan for BufferingExecutionPlan {
237238
vec![&self.input]
238239
}
239240

240-
fn with_new_children(
241+
fn replace_children(
241242
self: Arc<Self>,
242243
children: Vec<Arc<dyn ExecutionPlan>>,
244+
_options: ReplaceChildrenOptions,
243245
) -> Result<Arc<dyn ExecutionPlan>> {
244246
if children.len() == 1 {
245247
Ok(Arc::new(BufferingExecutionPlan::new(
@@ -251,6 +253,16 @@ impl ExecutionPlan for BufferingExecutionPlan {
251253
}
252254
}
253255

256+
fn with_new_children(
257+
self: Arc<Self>,
258+
children: Vec<Arc<dyn ExecutionPlan>>,
259+
) -> Result<Arc<dyn ExecutionPlan>> {
260+
self.replace_children(
261+
children,
262+
ReplaceChildrenOptions::new(ChildrenPropertiesMode::Recompute),
263+
)
264+
}
265+
254266
fn execute(
255267
&self,
256268
partition: usize,

‎datafusion-examples/examples/proto/composed_extension_codec.rs‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ use datafusion::common::Result;
3939
use datafusion::common::internal_err;
4040
use datafusion::common::tree_node::TreeNodeRecursion;
4141
use datafusion::execution::TaskContext;
42+
use datafusion::physical_plan::{ChildrenPropertiesMode, ReplaceChildrenOptions};
4243
use datafusion::physical_plan::{DisplayAs, ExecutionPlan};
4344
use datafusion::prelude::SessionContext;
4445
use datafusion_proto::physical_plan::{
@@ -111,13 +112,24 @@ impl ExecutionPlan for ParentExec {
111112
vec![&self.input]
112113
}
113114

114-
fn with_new_children(
115+
fn replace_children(
115116
self: Arc<Self>,
116-
_children: Vec<Arc<dyn ExecutionPlan>>,
117+
_: Vec<Arc<dyn ExecutionPlan>>,
118+
_: ReplaceChildrenOptions,
117119
) -> Result<Arc<dyn ExecutionPlan>> {
118120
unreachable!()
119121
}
120122

123+
fn with_new_children(
124+
self: Arc<Self>,
125+
children: Vec<Arc<dyn ExecutionPlan>>,
126+
) -> Result<Arc<dyn ExecutionPlan>> {
127+
self.replace_children(
128+
children,
129+
ReplaceChildrenOptions::new(ChildrenPropertiesMode::Recompute),
130+
)
131+
}
132+
121133
fn execute(
122134
&self,
123135
_partition: usize,
@@ -198,13 +210,24 @@ impl ExecutionPlan for ChildExec {
198210
vec![]
199211
}
200212

201-
fn with_new_children(
213+
fn replace_children(
202214
self: Arc<Self>,
203-
_children: Vec<Arc<dyn ExecutionPlan>>,
215+
_: Vec<Arc<dyn ExecutionPlan>>,
216+
_: ReplaceChildrenOptions,
204217
) -> Result<Arc<dyn ExecutionPlan>> {
205218
unreachable!()
206219
}
207220

221+
fn with_new_children(
222+
self: Arc<Self>,
223+
children: Vec<Arc<dyn ExecutionPlan>>,
224+
) -> Result<Arc<dyn ExecutionPlan>> {
225+
self.replace_children(
226+
children,
227+
ReplaceChildrenOptions::new(ChildrenPropertiesMode::Recompute),
228+
)
229+
}
230+
208231
fn execute(
209232
&self,
210233
_partition: usize,

‎datafusion-examples/examples/relation_planner/table_sample.rs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ use futures::{
100100
use rand::{Rng, SeedableRng, rngs::StdRng};
101101
use tonic::async_trait;
102102

103-
use datafusion::optimizer::simplify_expressions::simplify_literal::parse_literal;
104103
use datafusion::{
105104
catalog::Session,
106105
execution::{
@@ -116,6 +115,10 @@ use datafusion::{
116115
physical_planner::{DefaultPhysicalPlanner, ExtensionPlanner, PhysicalPlanner},
117116
prelude::*,
118117
};
118+
use datafusion::{
119+
optimizer::simplify_expressions::simplify_literal::parse_literal,
120+
physical_plan::{ChildrenPropertiesMode, ReplaceChildrenOptions},
121+
};
119122
use datafusion_common::{
120123
DFSchemaRef, DataFusionError, Result, Statistics, internal_err, not_impl_err,
121124
plan_datafusion_err, plan_err, tree_node::TreeNodeRecursion,
@@ -698,9 +701,10 @@ impl ExecutionPlan for SampleExec {
698701
vec![&self.input]
699702
}
700703

701-
fn with_new_children(
704+
fn replace_children(
702705
self: Arc<Self>,
703706
mut children: Vec<Arc<dyn ExecutionPlan>>,
707+
_: ReplaceChildrenOptions,
704708
) -> Result<Arc<dyn ExecutionPlan>> {
705709
Ok(Arc::new(Self::try_new(
706710
children.swap_remove(0),
@@ -710,6 +714,16 @@ impl ExecutionPlan for SampleExec {
710714
)?))
711715
}
712716

717+
fn with_new_children(
718+
self: Arc<Self>,
719+
children: Vec<Arc<dyn ExecutionPlan>>,
720+
) -> Result<Arc<dyn ExecutionPlan>> {
721+
self.replace_children(
722+
children,
723+
ReplaceChildrenOptions::new(ChildrenPropertiesMode::Recompute),
724+
)
725+
}
726+
713727
fn execute(
714728
&self,
715729
partition: usize,

0 commit comments

Comments
 (0)