Skip to content

Commit 8a3de4e

Browse files
authored
Feat: Normalize TableMetadata (apache#611)
* Normalize Table Metadata * Improve readability & comments
1 parent e08c0e5 commit 8a3de4e

File tree

6 files changed

+631
-117
lines changed

6 files changed

+631
-117
lines changed

crates/catalog/rest/tests/rest_catalog_test.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,8 @@ async fn test_create_table() {
293293
assert_eq!(table.metadata().format_version(), FormatVersion::V2);
294294
assert!(table.metadata().current_snapshot().is_none());
295295
assert!(table.metadata().history().is_empty());
296-
assert!(table.metadata().default_sort_order().unwrap().is_unsorted());
297-
assert!(table
298-
.metadata()
299-
.default_partition_spec()
300-
.unwrap()
301-
.is_unpartitioned());
296+
assert!(table.metadata().default_sort_order().is_unsorted());
297+
assert!(table.metadata().default_partition_spec().is_unpartitioned());
302298
}
303299

304300
#[tokio::test]

crates/iceberg/src/io/object_cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ mod tests {
252252
async fn setup_manifest_files(&mut self) {
253253
let current_snapshot = self.table.metadata().current_snapshot().unwrap();
254254
let current_schema = current_snapshot.schema(self.table.metadata()).unwrap();
255-
let current_partition_spec = self.table.metadata().default_partition_spec().unwrap();
255+
let current_partition_spec = self.table.metadata().default_partition_spec();
256256

257257
// Write data files
258258
let data_file_manifest = ManifestWriter::new(

crates/iceberg/src/scan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ mod tests {
979979
.parent_snapshot(self.table.metadata())
980980
.unwrap();
981981
let current_schema = current_snapshot.schema(self.table.metadata()).unwrap();
982-
let current_partition_spec = self.table.metadata().default_partition_spec().unwrap();
982+
let current_partition_spec = self.table.metadata().default_partition_spec();
983983

984984
// Write data files
985985
let data_file_manifest = ManifestWriter::new(

crates/iceberg/src/spec/sort.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub struct SortOrder {
112112
}
113113

114114
impl SortOrder {
115-
const UNSORTED_ORDER_ID: i64 = 0;
115+
pub(crate) const UNSORTED_ORDER_ID: i64 = 0;
116116

117117
/// Create sort order builder
118118
pub fn builder() -> SortOrderBuilder {

0 commit comments

Comments
 (0)