1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
//! Custom execution plan for renaming columns
//!
//! This module implements a DataFusion execution plan that wraps a scan
//! and renames columns from their original Parquet names to current DuckLake names.
//! This is needed when columns have been renamed in DuckLake metadata but the
//! Parquet files still have the original column names.
use std::collections::HashMap;
use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
use datafusion::error::{DataFusionError, Result as DataFusionResult};
use datafusion::execution::{RecordBatchStream, SendableRecordBatchStream, TaskContext};
use datafusion::physical_expr::EquivalenceProperties;
use datafusion::physical_plan::execution_plan::Boundedness;
use datafusion::physical_plan::{
DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties, PlanProperties,
};
use futures::Stream;
/// Custom execution plan that renames columns from Parquet file names to current DuckLake names
#[derive(Debug)]
pub struct ColumnRenameExec {
/// The input execution plan (typically ParquetExec)
input: Arc<dyn ExecutionPlan>,
/// Output schema with renamed columns
output_schema: SchemaRef,
/// Mapping from old (Parquet) column names to new (DuckLake) column names
name_mapping: HashMap<String, String>,
/// Reverse mapping: new name -> old name, for looking up input columns
reverse_mapping: Arc<HashMap<String, String>>,
/// Cached plan properties with updated schema
properties: Arc<PlanProperties>,
}
impl ColumnRenameExec {
pub fn new(
input: Arc<dyn ExecutionPlan>,
output_schema: SchemaRef,
name_mapping: HashMap<String, String>,
) -> Self {
// PlanProperties must use output schema for DataFusion schema validation
let eq_props = EquivalenceProperties::new(Arc::clone(&output_schema));
let properties = Arc::new(PlanProperties::new(
eq_props,
input.output_partitioning().clone(),
input.pipeline_behavior(),
Boundedness::Bounded,
));
// Pre-compute reverse mapping once (new_name -> old_name)
let reverse_mapping: HashMap<String, String> = name_mapping
.iter()
.map(|(old, new)| (new.clone(), old.clone()))
.collect();
Self {
input,
output_schema,
name_mapping,
reverse_mapping: Arc::new(reverse_mapping),
properties,
}
}
}
impl DisplayAs for ColumnRenameExec {
fn fmt_as(&self, _t: DisplayFormatType, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "ColumnRenameExec: renames={}", self.name_mapping.len())
}
}
impl ExecutionPlan for ColumnRenameExec {
fn name(&self) -> &str {
"ColumnRenameExec"
}
fn properties(&self) -> &Arc<PlanProperties> {
&self.properties
}
fn children(&self) -> Vec<&Arc<dyn ExecutionPlan>> {
vec![&self.input]
}
fn with_new_children(
self: Arc<Self>,
children: Vec<Arc<dyn ExecutionPlan>>,
) -> DataFusionResult<Arc<dyn ExecutionPlan>> {
if children.len() != 1 {
return Err(DataFusionError::Internal(
"ColumnRenameExec expects exactly one child".into(),
));
}
// Must call new() to rebuild properties from new child's partitioning
Ok(Arc::new(ColumnRenameExec::new(
Arc::clone(&children[0]),
Arc::clone(&self.output_schema),
self.name_mapping.clone(),
)))
}
fn execute(
&self,
partition: usize,
context: Arc<TaskContext>,
) -> DataFusionResult<SendableRecordBatchStream> {
let input_stream = self.input.execute(partition, context)?;
Ok(Box::pin(ColumnRenameStream {
input: input_stream,
output_schema: Arc::clone(&self.output_schema),
reverse_mapping: Arc::clone(&self.reverse_mapping),
}))
}
}
/// Stream that renames columns in output batches
struct ColumnRenameStream {
input: SendableRecordBatchStream,
output_schema: SchemaRef,
/// Mapping from output column name -> input column name (for renamed columns only)
reverse_mapping: Arc<HashMap<String, String>>,
}
impl Stream for ColumnRenameStream {
type Item = DataFusionResult<RecordBatch>;
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
match Pin::new(&mut self.input).poll_next(cx) {
Poll::Ready(Some(Ok(batch))) => {
let result: DataFusionResult<RecordBatch> =
if self.output_schema.fields().is_empty() {
// Zero OUTPUT columns (e.g. COUNT(*)): preserve the row count
// with an empty schema. This must key off the output schema,
// not the input: on positional paths the input still carries
// the internal `__ducklake_row_pos` column (1 input column),
// yet the output is zero columns and the count must survive.
use arrow::record_batch::RecordBatchOptions;
let options =
RecordBatchOptions::new().with_row_count(Some(batch.num_rows()));
RecordBatch::try_new_with_options(
Arc::clone(&self.output_schema),
vec![],
&options,
)
.map_err(|e| DataFusionError::ArrowError(Box::new(e), None))
} else {
// Build columns by looking up each output field in the input batch
let input_schema = batch.schema();
let columns: DataFusionResult<Vec<_>> = self
.output_schema
.fields()
.iter()
.map(|output_field| {
// Check if this column was renamed (new_name -> old_name)
let input_name = self
.reverse_mapping
.get(output_field.name())
.map(|s| s.as_str())
.unwrap_or_else(|| output_field.name().as_str());
let idx = input_schema
.index_of(input_name)
.map_err(|e| DataFusionError::ArrowError(Box::new(e), None))?;
// Coerce the column read from the file back to the
// catalog (output) type, keeping the provider
// self-consistent: it advertises and emits the catalog
// schema regardless of the file's physical Arrow type.
// Identical types clone cheaply.
coerce_column(batch.column(idx), output_field.data_type())
})
.collect();
columns.and_then(|cols| {
RecordBatch::try_new(Arc::clone(&self.output_schema), cols)
.map_err(|e| DataFusionError::ArrowError(Box::new(e), None))
})
};
Poll::Ready(Some(result))
},
Poll::Ready(Some(Err(e))) => Poll::Ready(Some(Err(e))),
Poll::Ready(None) => Poll::Ready(None),
Poll::Pending => Poll::Pending,
}
}
}
impl RecordBatchStream for ColumnRenameStream {
fn schema(&self) -> SchemaRef {
Arc::clone(&self.output_schema)
}
}
/// Coerce a column read from a parquet file to the catalog's declared type.
///
/// The physical Arrow type in a file can differ from the catalog type for list
/// columns: a DuckDB `ARRAY` may materialise as `FixedSizeList(N)` while the
/// catalog declares a variable `List`, and externally-written files often carry
/// an empty list child field name (`""`) where the catalog uses `"item"`.
///
/// `arrow::compute::cast` handles the structural value conversion
/// (`FixedSizeList` ↔ `List`, element-type changes) but leaves the list child
/// **field name** as-is, so a pure child-name difference round-trips unchanged
/// and would fail `RecordBatch::try_new`. After casting we therefore re-stamp the
/// array's `DataType` to the target when only nested field metadata differs —
/// the buffer layout is identical, so this is a zero-copy metadata swap.
pub(crate) fn coerce_column(
col: &arrow::array::ArrayRef,
target: &arrow::datatypes::DataType,
) -> DataFusionResult<arrow::array::ArrayRef> {
use arrow::array::{Array, make_array};
if col.data_type() == target {
return Ok(Arc::clone(col));
}
let casted = arrow::compute::cast(col, target)
.map_err(|e| DataFusionError::ArrowError(Box::new(e), None))?;
if casted.data_type() == target {
return Ok(casted);
}
// Same physical layout, only nested field metadata (e.g. list child name)
// differs. Rebuild the ArrayData with the target DataType.
let data = casted
.into_data()
.into_builder()
.data_type(target.clone())
.build()
.map_err(|e| DataFusionError::ArrowError(Box::new(e), None))?;
Ok(make_array(data))
}
#[cfg(test)]
mod tests {
use super::*;
use arrow::datatypes::{DataType, Field, Schema};
use datafusion::physical_plan::EmptyRecordBatchStream;
#[test]
fn test_column_rename_stream_schema() {
let input_schema = Arc::new(Schema::new(vec![Field::new(
"old_col",
DataType::Int32,
false,
)]));
let output_schema = Arc::new(Schema::new(vec![Field::new(
"new_col",
DataType::Int32,
false,
)]));
let mut reverse_mapping = HashMap::new();
reverse_mapping.insert("new_col".to_string(), "old_col".to_string());
let stream = ColumnRenameStream {
input: Box::pin(EmptyRecordBatchStream::new(input_schema)),
output_schema: Arc::clone(&output_schema),
reverse_mapping: Arc::new(reverse_mapping),
};
// The stream should report the output schema
assert_eq!(stream.schema().field(0).name(), "new_col");
}
}