Skip to content

Commit 5a7d5ab

Browse files
feniljainfeniljain
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 92ab3c4 commit 5a7d5ab

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,8 +1164,8 @@ impl DataFile {
11641164
&self.upper_bounds
11651165
}
11661166
/// Get the Implementation-specific key metadata for the data file.
1167-
pub fn key_metadata(&self) -> &Option<Vec<u8>> {
1168-
&self.key_metadata
1167+
pub fn key_metadata(&self) -> Option<&[u8]> {
1168+
self.key_metadata.as_ref().map(|x| x as &[u8])
11691169
}
11701170
/// Get the split offsets of the data file.
11711171
/// For example, all row group offsets in a Parquet file.
@@ -1658,7 +1658,7 @@ mod tests {
16581658
nan_value_counts: HashMap::new(),
16591659
lower_bounds: HashMap::new(),
16601660
upper_bounds: HashMap::new(),
1661-
key_metadata: Some(Vec::new()),
1661+
key_metadata: None,
16621662
split_offsets: vec![4],
16631663
equality_ids: Vec::new(),
16641664
sort_order_id: None,
@@ -1814,7 +1814,7 @@ mod tests {
18141814
nan_value_counts: HashMap::new(),
18151815
lower_bounds: HashMap::new(),
18161816
upper_bounds: HashMap::new(),
1817-
key_metadata: Some(vec![]),
1817+
key_metadata: None,
18181818
split_offsets: vec![4],
18191819
equality_ids: vec![],
18201820
sort_order_id: None,
@@ -1881,7 +1881,7 @@ mod tests {
18811881
nan_value_counts: HashMap::new(),
18821882
lower_bounds: HashMap::from([(1,Datum::int(1)),(2,Datum::string("a")),(3,Datum::string("AC/DC"))]),
18831883
upper_bounds: HashMap::from([(1,Datum::int(1)),(2,Datum::string("a")),(3,Datum::string("AC/DC"))]),
1884-
key_metadata: Some(vec![]),
1884+
key_metadata: None,
18851885
split_offsets: vec![4],
18861886
equality_ids: vec![],
18871887
sort_order_id: Some(0),
@@ -1961,7 +1961,7 @@ mod tests {
19611961
(2, Datum::string("a")),
19621962
(3, Datum::string("x"))
19631963
]),
1964-
key_metadata: Some(vec![]),
1964+
key_metadata: None,
19651965
split_offsets: vec![4],
19661966
equality_ids: vec![],
19671967
sort_order_id: Some(0),
@@ -2036,7 +2036,7 @@ mod tests {
20362036
(2, Datum::int(2)),
20372037
(3, Datum::string("x"))
20382038
]),
2039-
key_metadata: Some(vec![]),
2039+
key_metadata: None,
20402040
split_offsets: vec![4],
20412041
equality_ids: vec![],
20422042
sort_order_id: None,
@@ -2106,7 +2106,7 @@ mod tests {
21062106
(1, Datum::long(1)),
21072107
(2, Datum::int(2)),
21082108
]),
2109-
key_metadata: Some(vec![]),
2109+
key_metadata: None,
21102110
split_offsets: vec![4],
21112111
equality_ids: vec![],
21122112
sort_order_id: None,
@@ -2184,7 +2184,7 @@ mod tests {
21842184
nan_value_counts: HashMap::new(),
21852185
lower_bounds: HashMap::new(),
21862186
upper_bounds: HashMap::new(),
2187-
key_metadata: Vec::new(),
2187+
key_metadata: None,
21882188
split_offsets: vec![4],
21892189
equality_ids: Vec::new(),
21902190
sort_order_id: None,
@@ -2215,7 +2215,7 @@ mod tests {
22152215
nan_value_counts: HashMap::new(),
22162216
lower_bounds: HashMap::new(),
22172217
upper_bounds: HashMap::new(),
2218-
key_metadata: Vec::new(),
2218+
key_metadata: None,
22192219
split_offsets: vec![4],
22202220
equality_ids: Vec::new(),
22212221
sort_order_id: None,
@@ -2247,7 +2247,7 @@ mod tests {
22472247
nan_value_counts: HashMap::new(),
22482248
lower_bounds: HashMap::new(),
22492249
upper_bounds: HashMap::new(),
2250-
key_metadata: Vec::new(),
2250+
key_metadata: None,
22512251
split_offsets: vec![4],
22522252
equality_ids: Vec::new(),
22532253
sort_order_id: None,
@@ -2279,7 +2279,7 @@ mod tests {
22792279
nan_value_counts: HashMap::new(),
22802280
lower_bounds: HashMap::new(),
22812281
upper_bounds: HashMap::new(),
2282-
key_metadata: Vec::new(),
2282+
key_metadata: None,
22832283
split_offsets: vec![4],
22842284
equality_ids: Vec::new(),
22852285
sort_order_id: None,

0 commit comments

Comments
 (0)