diff --git a/crates/store/re_chunk/src/batcher.rs b/crates/store/re_chunk/src/batcher.rs index 75d682c34163..9143124a9ad4 100644 --- a/crates/store/re_chunk/src/batcher.rs +++ b/crates/store/re_chunk/src/batcher.rs @@ -734,7 +734,7 @@ impl PendingRow { for (component_desc, array) in components { let list_array = arrow_util::arrays_to_list_array_opt(&[Some(&*array as _)]); if let Some(list_array) = list_array { - per_name.insert_descriptor_arrow1(component_desc, list_array); + per_name.insert_descriptor(component_desc, list_array); } } @@ -870,10 +870,7 @@ impl PendingRow { let list_array = arrow_util::arrays_to_list_array_opt(&arrays); if let Some(list_array) = list_array { - per_name.insert_descriptor_arrow1( - component_desc, - list_array, - ); + per_name.insert_descriptor(component_desc, list_array); } } per_name @@ -918,7 +915,7 @@ impl PendingRow { for (component_desc, arrays) in components { let list_array = arrow_util::arrays_to_list_array_opt(&arrays); if let Some(list_array) = list_array { - per_name.insert_descriptor_arrow1(component_desc, list_array); + per_name.insert_descriptor(component_desc, list_array); } } per_name diff --git a/crates/store/re_chunk/src/builder.rs b/crates/store/re_chunk/src/builder.rs index 2dcdbcaf0f0b..f0dc99b1cd0e 100644 --- a/crates/store/re_chunk/src/builder.rs +++ b/crates/store/re_chunk/src/builder.rs @@ -240,7 +240,7 @@ impl ChunkBuilder { .map(|list_array| (component_desc, list_array)) }) { - per_name.insert_descriptor(component_desc, list_array); + per_name.insert_descriptor_arrow2(component_desc, list_array); } per_name }; @@ -303,7 +303,7 @@ impl ChunkBuilder { } }) { - per_name.insert_descriptor(component_desc, list_array); + per_name.insert_descriptor_arrow2(component_desc, list_array); } per_name }, diff --git a/crates/store/re_chunk/src/chunk.rs b/crates/store/re_chunk/src/chunk.rs index 017272592735..c5fad08f5bef 100644 --- a/crates/store/re_chunk/src/chunk.rs +++ b/crates/store/re_chunk/src/chunk.rs @@ -63,7 +63,7 @@ pub struct ChunkComponents( impl ChunkComponents { /// Like `Self::insert`, but automatically infers the [`ComponentName`] layer. #[inline] - pub fn insert_descriptor_arrow1( + pub fn insert_descriptor( &mut self, component_desc: ComponentDescriptor, list_array: ArrowListArray, @@ -79,7 +79,7 @@ impl ChunkComponents { /// Like `Self::insert`, but automatically infers the [`ComponentName`] layer. #[inline] - pub fn insert_descriptor( + pub fn insert_descriptor_arrow2( &mut self, component_desc: ComponentDescriptor, list_array: Arrow2ListArray, @@ -161,7 +161,7 @@ impl FromIterator<(ComponentDescriptor, ArrowListArray)> for ChunkComponents { let mut this = Self::default(); { for (component_desc, list_array) in iter { - this.insert_descriptor(component_desc, list_array.into()); + this.insert_descriptor_arrow2(component_desc, list_array.into()); } } this @@ -190,7 +190,7 @@ impl FromIterator<(ComponentDescriptor, Arrow2ListArray)> for ChunkComponen let mut this = Self::default(); { for (component_desc, list_array) in iter { - this.insert_descriptor(component_desc, list_array); + this.insert_descriptor_arrow2(component_desc, list_array); } } this @@ -959,7 +959,7 @@ impl Chunk { list_array: Arrow2ListArray, ) -> ChunkResult<()> { self.components - .insert_descriptor(component_desc, list_array); + .insert_descriptor_arrow2(component_desc, list_array); self.sanity_check() } diff --git a/crates/store/re_chunk/src/merge.rs b/crates/store/re_chunk/src/merge.rs index cd8ef80f32d2..b101e720b07b 100644 --- a/crates/store/re_chunk/src/merge.rs +++ b/crates/store/re_chunk/src/merge.rs @@ -173,7 +173,7 @@ impl Chunk { let components = { let mut per_name = ChunkComponents::default(); for (component_desc, list_array) in components { - per_name.insert_descriptor(component_desc.clone(), list_array); + per_name.insert_descriptor_arrow2(component_desc.clone(), list_array); } per_name }; diff --git a/crates/store/re_chunk/src/migration.rs b/crates/store/re_chunk/src/migration.rs index 165702c92916..fe50b9a53e20 100644 --- a/crates/store/re_chunk/src/migration.rs +++ b/crates/store/re_chunk/src/migration.rs @@ -88,7 +88,7 @@ impl Chunk { } for (desc, list_array) in components_patched { - chunk.components.insert_descriptor(desc, list_array); + chunk.components.insert_descriptor_arrow2(desc, list_array); } chunk diff --git a/crates/store/re_chunk/src/transport.rs b/crates/store/re_chunk/src/transport.rs index 96e1b55e1c6d..10946bb12a9d 100644 --- a/crates/store/re_chunk/src/transport.rs +++ b/crates/store/re_chunk/src/transport.rs @@ -651,7 +651,7 @@ impl Chunk { let component_desc = TransportChunk::component_descriptor_from_field(field); if components - .insert_descriptor(component_desc, column.clone()) + .insert_descriptor_arrow2(component_desc, column.clone()) .is_some() { return Err(ChunkError::Malformed {