Skip to content

Commit 75cc2bc

Browse files
committed
Add NameMapping. Still need to populate from table metadata. Want to test with DataFusion Comet first.
1 parent da243bf commit 75cc2bc

File tree

6 files changed

+341
-175
lines changed

6 files changed

+341
-175
lines changed

crates/iceberg/src/arrow/delete_filter.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ pub(crate) mod tests {
341341
deletes: vec![pos_del_1, pos_del_2.clone()],
342342
partition: None,
343343
partition_spec: None,
344+
name_mapping: None,
344345
},
345346
FileScanTask {
346347
start: 0,
@@ -354,6 +355,7 @@ pub(crate) mod tests {
354355
deletes: vec![pos_del_3],
355356
partition: None,
356357
partition_spec: None,
358+
name_mapping: None,
357359
},
358360
];
359361

crates/iceberg/src/arrow/reader.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ impl ArrowReader {
243243
task.project_field_ids(),
244244
task.partition_spec.clone(),
245245
task.partition.clone(),
246+
task.name_mapping.clone(),
246247
)
247248
} else {
248249
// Fallback to build without partition data
@@ -1961,6 +1962,7 @@ message schema {
19611962
deletes: vec![],
19621963
partition: None,
19631964
partition_spec: None,
1965+
name_mapping: None,
19641966
})]
19651967
.into_iter(),
19661968
)) as FileScanTaskStream;
@@ -2281,6 +2283,7 @@ message schema {
22812283
deletes: vec![],
22822284
partition: None,
22832285
partition_spec: None,
2286+
name_mapping: None,
22842287
};
22852288

22862289
// Task 2: read the second and third row groups
@@ -2296,6 +2299,7 @@ message schema {
22962299
deletes: vec![],
22972300
partition: None,
22982301
partition_spec: None,
2302+
name_mapping: None,
22992303
};
23002304

23012305
let tasks1 = Box::pin(futures::stream::iter(vec![Ok(task1)])) as FileScanTaskStream;
@@ -2427,6 +2431,7 @@ message schema {
24272431
deletes: vec![],
24282432
partition: None,
24292433
partition_spec: None,
2434+
name_mapping: None,
24302435
})]
24312436
.into_iter(),
24322437
)) as FileScanTaskStream;
@@ -2597,6 +2602,7 @@ message schema {
25972602
}],
25982603
partition: None,
25992604
partition_spec: None,
2605+
name_mapping: None,
26002606
};
26012607

26022608
let tasks = Box::pin(futures::stream::iter(vec![Ok(task)])) as FileScanTaskStream;
@@ -2814,6 +2820,7 @@ message schema {
28142820
}],
28152821
partition: None,
28162822
partition_spec: None,
2823+
name_mapping: None,
28172824
};
28182825

28192826
let tasks = Box::pin(futures::stream::iter(vec![Ok(task)])) as FileScanTaskStream;
@@ -3024,6 +3031,7 @@ message schema {
30243031
}],
30253032
partition: None,
30263033
partition_spec: None,
3034+
name_mapping: None,
30273035
};
30283036

30293037
let tasks = Box::pin(futures::stream::iter(vec![Ok(task)])) as FileScanTaskStream;
@@ -3126,6 +3134,7 @@ message schema {
31263134
deletes: vec![],
31273135
partition: None,
31283136
partition_spec: None,
3137+
name_mapping: None,
31293138
})]
31303139
.into_iter(),
31313140
)) as FileScanTaskStream;
@@ -3222,6 +3231,7 @@ message schema {
32223231
deletes: vec![],
32233232
partition: None,
32243233
partition_spec: None,
3234+
name_mapping: None,
32253235
})]
32263236
.into_iter(),
32273237
)) as FileScanTaskStream;
@@ -3307,6 +3317,7 @@ message schema {
33073317
deletes: vec![],
33083318
partition: None,
33093319
partition_spec: None,
3320+
name_mapping: None,
33103321
})]
33113322
.into_iter(),
33123323
)) as FileScanTaskStream;
@@ -3406,6 +3417,7 @@ message schema {
34063417
deletes: vec![],
34073418
partition: None,
34083419
partition_spec: None,
3420+
name_mapping: None,
34093421
})]
34103422
.into_iter(),
34113423
)) as FileScanTaskStream;
@@ -3534,6 +3546,7 @@ message schema {
35343546
deletes: vec![],
35353547
partition: None,
35363548
partition_spec: None,
3549+
name_mapping: None,
35373550
})]
35383551
.into_iter(),
35393552
)) as FileScanTaskStream;
@@ -3629,6 +3642,7 @@ message schema {
36293642
deletes: vec![],
36303643
partition: None,
36313644
partition_spec: None,
3645+
name_mapping: None,
36323646
})]
36333647
.into_iter(),
36343648
)) as FileScanTaskStream;
@@ -3737,6 +3751,7 @@ message schema {
37373751
deletes: vec![],
37383752
partition: None,
37393753
partition_spec: None,
3754+
name_mapping: None,
37403755
})]
37413756
.into_iter(),
37423757
)) as FileScanTaskStream;
@@ -3875,6 +3890,7 @@ message schema {
38753890
deletes: vec![],
38763891
partition: Some(partition_data),
38773892
partition_spec: Some(partition_spec),
3893+
name_mapping: None,
38783894
})]
38793895
.into_iter(),
38803896
)) as FileScanTaskStream;

0 commit comments

Comments
 (0)