Skip to content

Commit 92cae1b

Browse files
committed
fix: return Option<&[u8]> instead of &Option<Vec<u8>> for key_metadata
* test: use `None` instead of `Some` for key_metadata fields
1 parent d45f451 commit 92cae1b

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

crates/iceberg/src/expr/visitors/expression_evaluator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ mod tests {
338338
nan_value_counts: HashMap::new(),
339339
lower_bounds: HashMap::new(),
340340
upper_bounds: HashMap::new(),
341-
key_metadata: Some(vec![]),
341+
key_metadata: None,
342342
split_offsets: vec![],
343343
equality_ids: vec![],
344344
sort_order_id: None,
@@ -361,7 +361,7 @@ mod tests {
361361
nan_value_counts: HashMap::new(),
362362
lower_bounds: HashMap::new(),
363363
upper_bounds: HashMap::new(),
364-
key_metadata: Some(vec![]),
364+
key_metadata: None,
365365
split_offsets: vec![],
366366
equality_ids: vec![],
367367
sort_order_id: None,

crates/iceberg/src/expr/visitors/inclusive_metrics_evaluator.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@ mod test {
19911991
nan_value_counts: Default::default(),
19921992
lower_bounds: Default::default(),
19931993
upper_bounds: Default::default(),
1994-
key_metadata: Some(vec![]),
1994+
key_metadata: None,
19951995
split_offsets: vec![],
19961996
equality_ids: vec![],
19971997
sort_order_id: None,
@@ -2012,7 +2012,7 @@ mod test {
20122012
nan_value_counts: Default::default(),
20132013
lower_bounds: Default::default(),
20142014
upper_bounds: Default::default(),
2015-
key_metadata: Some(vec![]),
2015+
key_metadata: None,
20162016
split_offsets: vec![],
20172017
equality_ids: vec![],
20182018
sort_order_id: None,
@@ -2069,7 +2069,7 @@ mod test {
20692069
]),
20702070

20712071
column_sizes: Default::default(),
2072-
key_metadata: Some(vec![]),
2072+
key_metadata: None,
20732073
split_offsets: vec![],
20742074
equality_ids: vec![],
20752075
sort_order_id: None,
@@ -2095,7 +2095,7 @@ mod test {
20952095
upper_bounds: HashMap::from([(3, Datum::string("dC"))]),
20962096

20972097
column_sizes: Default::default(),
2098-
key_metadata: Some(vec![]),
2098+
key_metadata: None,
20992099
split_offsets: vec![],
21002100
equality_ids: vec![],
21012101
sort_order_id: None,
@@ -2122,7 +2122,7 @@ mod test {
21222122
upper_bounds: HashMap::from([(3, Datum::string("3str3"))]),
21232123

21242124
column_sizes: Default::default(),
2125-
key_metadata: Some(vec![]),
2125+
key_metadata: None,
21262126
split_offsets: vec![],
21272127
equality_ids: vec![],
21282128
sort_order_id: None,
@@ -2149,7 +2149,7 @@ mod test {
21492149
upper_bounds: HashMap::from([(3, Datum::string("イロハニホヘト"))]),
21502150

21512151
column_sizes: Default::default(),
2152-
key_metadata: Some(vec![]),
2152+
key_metadata: None,
21532153
split_offsets: vec![],
21542154
equality_ids: vec![],
21552155
sort_order_id: None,

crates/iceberg/src/spec/manifest.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,8 +1134,8 @@ impl DataFile {
11341134
&self.upper_bounds
11351135
}
11361136
/// Get the Implementation-specific key metadata for the data file.
1137-
pub fn key_metadata(&self) -> &Option<Vec<u8>> {
1138-
&self.key_metadata
1137+
pub fn key_metadata(&self) -> Option<&[u8]> {
1138+
self.key_metadata.as_ref().map(|x| &x as &[u8])
11391139
}
11401140
/// Get the split offsets of the data file.
11411141
/// For example, all row group offsets in a Parquet file.
@@ -1628,7 +1628,7 @@ mod tests {
16281628
nan_value_counts: HashMap::new(),
16291629
lower_bounds: HashMap::new(),
16301630
upper_bounds: HashMap::new(),
1631-
key_metadata: Some(Vec::new()),
1631+
key_metadata: None,
16321632
split_offsets: vec![4],
16331633
equality_ids: Vec::new(),
16341634
sort_order_id: None,
@@ -1784,7 +1784,7 @@ mod tests {
17841784
nan_value_counts: HashMap::new(),
17851785
lower_bounds: HashMap::new(),
17861786
upper_bounds: HashMap::new(),
1787-
key_metadata: Some(vec![]),
1787+
key_metadata: None,
17881788
split_offsets: vec![4],
17891789
equality_ids: vec![],
17901790
sort_order_id: None,
@@ -1851,7 +1851,7 @@ mod tests {
18511851
nan_value_counts: HashMap::new(),
18521852
lower_bounds: HashMap::from([(1,Datum::int(1)),(2,Datum::string("a")),(3,Datum::string("AC/DC"))]),
18531853
upper_bounds: HashMap::from([(1,Datum::int(1)),(2,Datum::string("a")),(3,Datum::string("AC/DC"))]),
1854-
key_metadata: Some(vec![]),
1854+
key_metadata: None,
18551855
split_offsets: vec![4],
18561856
equality_ids: vec![],
18571857
sort_order_id: Some(0),
@@ -1931,7 +1931,7 @@ mod tests {
19311931
(2, Datum::string("a")),
19321932
(3, Datum::string("x"))
19331933
]),
1934-
key_metadata: Some(vec![]),
1934+
key_metadata: None,
19351935
split_offsets: vec![4],
19361936
equality_ids: vec![],
19371937
sort_order_id: Some(0),
@@ -2006,7 +2006,7 @@ mod tests {
20062006
(2, Datum::int(2)),
20072007
(3, Datum::string("x"))
20082008
]),
2009-
key_metadata: Some(vec![]),
2009+
key_metadata: None,
20102010
split_offsets: vec![4],
20112011
equality_ids: vec![],
20122012
sort_order_id: None,
@@ -2076,7 +2076,7 @@ mod tests {
20762076
(1, Datum::long(1)),
20772077
(2, Datum::int(2)),
20782078
]),
2079-
key_metadata: Some(vec![]),
2079+
key_metadata: None,
20802080
split_offsets: vec![4],
20812081
equality_ids: vec![],
20822082
sort_order_id: None,

0 commit comments

Comments
 (0)