From e065cb8d0e87494c3c69e5eb6fe998d527b215d9 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 21 Nov 2024 16:02:41 +0100 Subject: [PATCH] Call it `to_arrow2` where it makes sense --- crates/store/re_chunk/src/builder.rs | 6 +- crates/store/re_chunk/src/chunk.rs | 2 +- crates/store/re_chunk/src/merge.rs | 4 +- crates/store/re_chunk/src/slice.rs | 20 +- .../tests/types/annotation_context.rs | 2 +- crates/store/re_types/tests/types/arrows3d.rs | 2 +- crates/store/re_types/tests/types/asset3d.rs | 2 +- crates/store/re_types/tests/types/box2d.rs | 2 +- crates/store/re_types/tests/types/box3d.rs | 2 +- crates/store/re_types/tests/types/clear.rs | 2 +- .../store/re_types/tests/types/depth_image.rs | 2 +- .../tests/types/disconnected_space.rs | 2 +- crates/store/re_types/tests/types/fuzzy.rs | 8 +- .../re_types/tests/types/line_strips2d.rs | 2 +- .../re_types/tests/types/line_strips3d.rs | 2 +- crates/store/re_types/tests/types/mesh3d.rs | 2 +- crates/store/re_types/tests/types/pinhole.rs | 2 +- crates/store/re_types/tests/types/points2d.rs | 2 +- crates/store/re_types/tests/types/points3d.rs | 2 +- .../tests/types/segmentation_image.rs | 2 +- crates/store/re_types/tests/types/tensor.rs | 2 +- .../re_types/tests/types/text_document.rs | 2 +- .../store/re_types/tests/types/transform3d.rs | 2 +- .../re_types/tests/types/view_coordinates.rs | 2 +- crates/store/re_types_core/src/archetype.rs | 6 +- crates/store/re_types_core/src/lib.rs | 4 +- .../store/re_types_core/src/loggable_batch.rs | 28 +-- crates/top/re_sdk/src/recording_stream.rs | 2 +- crates/viewer/re_viewer/src/reflection/mod.rs | 194 +++++++++--------- .../src/component_fallbacks.rs | 2 +- .../src/component_ui_registry.rs | 2 +- 31 files changed, 158 insertions(+), 158 deletions(-) diff --git a/crates/store/re_chunk/src/builder.rs b/crates/store/re_chunk/src/builder.rs index 939b7044b67a..9da99f0924e8 100644 --- a/crates/store/re_chunk/src/builder.rs +++ b/crates/store/re_chunk/src/builder.rs @@ -146,7 +146,7 @@ impl ChunkBuilder { row_id, timepoint, component_batch - .to_arrow() + .to_arrow2() .ok() .map(|array| (component_batch.name(), array)), ) @@ -165,7 +165,7 @@ impl ChunkBuilder { timepoint, component_batches.into_iter().filter_map(|component_batch| { component_batch - .to_arrow() + .to_arrow2() .ok() .map(|array| (component_batch.name(), array)) }), @@ -188,7 +188,7 @@ impl ChunkBuilder { .map(|(component_name, component_batch)| { ( component_name, - component_batch.and_then(|batch| batch.to_arrow().ok()), + component_batch.and_then(|batch| batch.to_arrow2().ok()), ) }), ) diff --git a/crates/store/re_chunk/src/chunk.rs b/crates/store/re_chunk/src/chunk.rs index 3429e077c666..26847f60e28f 100644 --- a/crates/store/re_chunk/src/chunk.rs +++ b/crates/store/re_chunk/src/chunk.rs @@ -623,7 +623,7 @@ impl Chunk { ) -> ChunkResult { re_tracing::profile_function!(); let row_ids = row_ids - .to_arrow() + .to_arrow2() // NOTE: impossible, but better safe than sorry. .map_err(|err| ChunkError::Malformed { reason: format!("RowIds failed to serialize: {err}"), diff --git a/crates/store/re_chunk/src/merge.rs b/crates/store/re_chunk/src/merge.rs index c93f3f12a196..4ba2ceba41a9 100644 --- a/crates/store/re_chunk/src/merge.rs +++ b/crates/store/re_chunk/src/merge.rs @@ -768,9 +768,9 @@ mod tests { let timepoint2 = [(Timeline::new_sequence("frame"), 2)]; let points32bit = - ::to_arrow(&MyPoint::new(1.0, 1.0))?; + ::to_arrow2(&MyPoint::new(1.0, 1.0))?; let points64bit = - ::to_arrow(&MyPoint64::new(1.0, 1.0))?; + ::to_arrow2(&MyPoint64::new(1.0, 1.0))?; let chunk1 = Chunk::builder(entity_path.into()) .with_row( diff --git a/crates/store/re_chunk/src/slice.rs b/crates/store/re_chunk/src/slice.rs index 35a08d21ad31..8e7f3fe4a427 100644 --- a/crates/store/re_chunk/src/slice.rs +++ b/crates/store/re_chunk/src/slice.rs @@ -984,8 +984,8 @@ mod tests { assert!(!chunk.is_sorted()); for (row_id, component_name, expected) in expectations { - let expected = - expected.and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + let expected = expected + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -994,8 +994,8 @@ mod tests { assert!(chunk.is_sorted()); for (row_id, component_name, expected) in expectations { - let expected = - expected.and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + let expected = expected + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -1113,7 +1113,7 @@ mod tests { for (row_id, component_name, expected) in expectations { let expected = expected - .and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -1144,7 +1144,7 @@ mod tests { for (row_id, component_name, expected) in expectations { let expected = expected - .and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -1240,7 +1240,7 @@ mod tests { for (row_id, component_name, expected) in expectations { let expected = expected - .and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -1259,7 +1259,7 @@ mod tests { for (row_id, component_name, expected) in expectations { let expected = expected - .and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -1386,7 +1386,7 @@ mod tests { for (row_id, component_name, expected) in expectations { let expected = expected - .and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } @@ -1533,7 +1533,7 @@ mod tests { for (row_id, component_name, expected) in expectations { let expected = expected - .and_then(|expected| re_types_core::LoggableBatch::to_arrow(expected).ok()); + .and_then(|expected| re_types_core::LoggableBatch::to_arrow2(expected).ok()); eprintln!("{component_name} @ {row_id}"); similar_asserts::assert_eq!(expected, chunk.cell(*row_id, component_name)); } diff --git a/crates/store/re_types/tests/types/annotation_context.rs b/crates/store/re_types/tests/types/annotation_context.rs index 36f744beeaca..662f4711666b 100644 --- a/crates/store/re_types/tests/types/annotation_context.rs +++ b/crates/store/re_types/tests/types/annotation_context.rs @@ -26,7 +26,7 @@ fn roundtrip() { [("context", vec!["rerun.components.AnnotationContext"])].into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/arrows3d.rs b/crates/store/re_types/tests/types/arrows3d.rs index 112ff13bd682..b105c1f402b2 100644 --- a/crates/store/re_types/tests/types/arrows3d.rs +++ b/crates/store/re_types/tests/types/arrows3d.rs @@ -59,7 +59,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/asset3d.rs b/crates/store/re_types/tests/types/asset3d.rs index 292c73050c9e..b432276c3753 100644 --- a/crates/store/re_types/tests/types/asset3d.rs +++ b/crates/store/re_types/tests/types/asset3d.rs @@ -24,7 +24,7 @@ fn roundtrip() { // .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/box2d.rs b/crates/store/re_types/tests/types/box2d.rs index ebda5cae2881..66a46df25afe 100644 --- a/crates/store/re_types/tests/types/box2d.rs +++ b/crates/store/re_types/tests/types/box2d.rs @@ -58,7 +58,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/box3d.rs b/crates/store/re_types/tests/types/box3d.rs index d71fbaf8eaba..8fd6a84ed5f0 100644 --- a/crates/store/re_types/tests/types/box3d.rs +++ b/crates/store/re_types/tests/types/box3d.rs @@ -72,7 +72,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/clear.rs b/crates/store/re_types/tests/types/clear.rs index c704dec08988..a4c3f6671479 100644 --- a/crates/store/re_types/tests/types/clear.rs +++ b/crates/store/re_types/tests/types/clear.rs @@ -29,7 +29,7 @@ fn roundtrip() { similar_asserts::assert_eq!(expected, arch); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/depth_image.rs b/crates/store/re_types/tests/types/depth_image.rs index 418955f1bff9..ab3105026795 100644 --- a/crates/store/re_types/tests/types/depth_image.rs +++ b/crates/store/re_types/tests/types/depth_image.rs @@ -33,7 +33,7 @@ fn depth_image_roundtrip() { DepthImage::try_from(ndarray::array![[1u8, 2, 3], [4, 5, 6]]) .unwrap() .with_meter(1000.0) - .to_arrow() + .to_arrow2() .unwrap(), ]; diff --git a/crates/store/re_types/tests/types/disconnected_space.rs b/crates/store/re_types/tests/types/disconnected_space.rs index e99464e6bf84..df3b2156f904 100644 --- a/crates/store/re_types/tests/types/disconnected_space.rs +++ b/crates/store/re_types/tests/types/disconnected_space.rs @@ -36,7 +36,7 @@ fn roundtrip() { similar_asserts::assert_eq!(expected, arch); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/fuzzy.rs b/crates/store/re_types/tests/types/fuzzy.rs index c62a8a4d424c..4ea2cba3c072 100644 --- a/crates/store/re_types/tests/types/fuzzy.rs +++ b/crates/store/re_types/tests/types/fuzzy.rs @@ -247,7 +247,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); @@ -309,7 +309,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); @@ -362,7 +362,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); @@ -415,7 +415,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/line_strips2d.rs b/crates/store/re_types/tests/types/line_strips2d.rs index ecff558d208a..62e1c010a038 100644 --- a/crates/store/re_types/tests/types/line_strips2d.rs +++ b/crates/store/re_types/tests/types/line_strips2d.rs @@ -63,7 +63,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/line_strips3d.rs b/crates/store/re_types/tests/types/line_strips3d.rs index 6c491bd3e5af..02b34fadc8bc 100644 --- a/crates/store/re_types/tests/types/line_strips3d.rs +++ b/crates/store/re_types/tests/types/line_strips3d.rs @@ -61,7 +61,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/mesh3d.rs b/crates/store/re_types/tests/types/mesh3d.rs index 5b37426f3d95..17fb35e0e9f8 100644 --- a/crates/store/re_types/tests/types/mesh3d.rs +++ b/crates/store/re_types/tests/types/mesh3d.rs @@ -60,7 +60,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/pinhole.rs b/crates/store/re_types/tests/types/pinhole.rs index bfe63b07b831..0044e7d2e858 100644 --- a/crates/store/re_types/tests/types/pinhole.rs +++ b/crates/store/re_types/tests/types/pinhole.rs @@ -27,7 +27,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/points2d.rs b/crates/store/re_types/tests/types/points2d.rs index d4a8e81e6351..944dc45c0844 100644 --- a/crates/store/re_types/tests/types/points2d.rs +++ b/crates/store/re_types/tests/types/points2d.rs @@ -58,7 +58,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/points3d.rs b/crates/store/re_types/tests/types/points3d.rs index fac5b0882ffe..c0a4e57d4374 100644 --- a/crates/store/re_types/tests/types/points3d.rs +++ b/crates/store/re_types/tests/types/points3d.rs @@ -55,7 +55,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/segmentation_image.rs b/crates/store/re_types/tests/types/segmentation_image.rs index 4550ecad81b7..1c081ccd0e4d 100644 --- a/crates/store/re_types/tests/types/segmentation_image.rs +++ b/crates/store/re_types/tests/types/segmentation_image.rs @@ -30,7 +30,7 @@ fn segmentation_image_roundtrip() { [4, 5, 6] ]) .unwrap() - .to_arrow() + .to_arrow2() .unwrap()]; let expected_extensions: HashMap<_, _> = [("data", vec!["rerun.components.Blob"])].into(); diff --git a/crates/store/re_types/tests/types/tensor.rs b/crates/store/re_types/tests/types/tensor.rs index fc0b8a3e05c9..3474ae7b1d35 100644 --- a/crates/store/re_types/tests/types/tensor.rs +++ b/crates/store/re_types/tests/types/tensor.rs @@ -31,7 +31,7 @@ fn tensor_roundtrip() { let all_arch_serialized = [Tensor::try_from(ndarray::array![[1u8, 2, 3], [4, 5, 6]]) .unwrap() - .to_arrow() + .to_arrow2() .unwrap()]; let expected_extensions: HashMap<_, _> = [("data", vec!["rerun.components.TensorData"])].into(); diff --git a/crates/store/re_types/tests/types/text_document.rs b/crates/store/re_types/tests/types/text_document.rs index bc91df0b7615..3335cba8a33d 100644 --- a/crates/store/re_types/tests/types/text_document.rs +++ b/crates/store/re_types/tests/types/text_document.rs @@ -24,7 +24,7 @@ fn roundtrip() { .into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/transform3d.rs b/crates/store/re_types/tests/types/transform3d.rs index 28467f1ebf8c..4a8fd424a7b2 100644 --- a/crates/store/re_types/tests/types/transform3d.rs +++ b/crates/store/re_types/tests/types/transform3d.rs @@ -84,7 +84,7 @@ fn roundtrip() { similar_asserts::assert_eq!(expected, arch); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types/tests/types/view_coordinates.rs b/crates/store/re_types/tests/types/view_coordinates.rs index 6751030f14d6..1f2b89caba4b 100644 --- a/crates/store/re_types/tests/types/view_coordinates.rs +++ b/crates/store/re_types/tests/types/view_coordinates.rs @@ -21,7 +21,7 @@ fn roundtrip() { [("coordinates", vec!["rerun.components.ViewCoordinates"])].into(); eprintln!("arch = {arch:#?}"); - let serialized = arch.to_arrow().unwrap(); + let serialized = arch.to_arrow2().unwrap(); for (field, array) in &serialized { // NOTE: Keep those around please, very useful when debugging. // eprintln!("field = {field:#?}"); diff --git a/crates/store/re_types_core/src/archetype.rs b/crates/store/re_types_core/src/archetype.rs index 750df83ab64c..9a14d221ff36 100644 --- a/crates/store/re_types_core/src/archetype.rs +++ b/crates/store/re_types_core/src/archetype.rs @@ -216,7 +216,7 @@ impl Default for GenericIndicatorComponent { impl crate::LoggableBatch for GenericIndicatorComponent { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { let datatype = arrow2::datatypes::DataType::Null; Ok(arrow2::array::NullArray::new(datatype, 1).boxed()) } @@ -247,7 +247,7 @@ pub struct GenericIndicatorComponentArray { impl crate::LoggableBatch for GenericIndicatorComponentArray { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { let datatype = arrow2::datatypes::DataType::Null; Ok(arrow2::array::NullArray::new(datatype, self.len).boxed()) } @@ -282,7 +282,7 @@ impl NamedIndicatorComponent { impl crate::LoggableBatch for NamedIndicatorComponent { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { let datatype = arrow2::datatypes::DataType::Null; Ok(arrow2::array::NullArray::new(datatype, 1).boxed()) } diff --git a/crates/store/re_types_core/src/lib.rs b/crates/store/re_types_core/src/lib.rs index 0e61de9ba8a3..68943f6b7517 100644 --- a/crates/store/re_types_core/src/lib.rs +++ b/crates/store/re_types_core/src/lib.rs @@ -58,7 +58,7 @@ pub trait AsComponents { /// The default implementation will simply serialize the result of [`Self::as_component_batches`] /// as-is, which is what you want in 99.9% of cases. #[inline] - fn to_arrow( + fn to_arrow2( &self, ) -> SerializationResult)>> { @@ -67,7 +67,7 @@ pub trait AsComponents { .map(|comp_batch| { comp_batch .as_ref() - .to_arrow() + .to_arrow2() .map(|array| { let field = arrow2::datatypes::Field::new( comp_batch.name().to_string(), diff --git a/crates/store/re_types_core/src/loggable_batch.rs b/crates/store/re_types_core/src/loggable_batch.rs index 330419a3ac4a..864ab4f2c06b 100644 --- a/crates/store/re_types_core/src/loggable_batch.rs +++ b/crates/store/re_types_core/src/loggable_batch.rs @@ -22,7 +22,7 @@ pub trait LoggableBatch { // type Loggable: Loggable; /// Serializes the batch into an Arrow array. - fn to_arrow(&self) -> SerializationResult>; + fn to_arrow2(&self) -> SerializationResult>; } /// A [`ComponentBatch`] represents an array's worth of [`Component`] instances. @@ -32,7 +32,7 @@ pub trait ComponentBatch: LoggableBatch { /// Serializes the batch into an Arrow list array with a single component per list. fn to_arrow_list_array(&self) -> SerializationResult> { - let array = self.to_arrow()?; + let array = self.to_arrow2()?; let offsets = arrow2::offset::Offsets::try_from_lengths(std::iter::repeat(1).take(array.len()))?; let data_type = ArrowListArray::::default_datatype(array.data_type().clone()); @@ -88,8 +88,8 @@ impl<'a> std::ops::Deref for MaybeOwnedComponentBatch<'a> { impl<'a> LoggableBatch for MaybeOwnedComponentBatch<'a> { #[inline] - fn to_arrow(&self) -> SerializationResult> { - self.as_ref().to_arrow() + fn to_arrow2(&self) -> SerializationResult> { + self.as_ref().to_arrow2() } } @@ -104,7 +104,7 @@ impl<'a> ComponentBatch for MaybeOwnedComponentBatch<'a> { impl LoggableBatch for L { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2([std::borrow::Cow::Borrowed(self)]) } } @@ -119,7 +119,7 @@ impl ComponentBatch for C { impl LoggableBatch for Option { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2(self.iter().map(|v| std::borrow::Cow::Borrowed(v))) } } @@ -135,7 +135,7 @@ impl ComponentBatch for Option { impl LoggableBatch for Vec { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2(self.iter().map(|v| std::borrow::Cow::Borrowed(v))) } } @@ -151,7 +151,7 @@ impl ComponentBatch for Vec { impl LoggableBatch for Vec> { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2_opt( self.iter() .map(|opt| opt.as_ref().map(|v| std::borrow::Cow::Borrowed(v))), @@ -170,7 +170,7 @@ impl ComponentBatch for Vec> { impl LoggableBatch for [L; N] { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2(self.iter().map(|v| std::borrow::Cow::Borrowed(v))) } } @@ -186,7 +186,7 @@ impl ComponentBatch for [C; N] { impl LoggableBatch for [Option; N] { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2_opt( self.iter() .map(|opt| opt.as_ref().map(|v| std::borrow::Cow::Borrowed(v))), @@ -205,7 +205,7 @@ impl ComponentBatch for [Option; N] { impl<'a, L: Loggable> LoggableBatch for &'a [L] { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2(self.iter().map(|v| std::borrow::Cow::Borrowed(v))) } } @@ -221,7 +221,7 @@ impl<'a, C: Component> ComponentBatch for &'a [C] { impl<'a, L: Loggable> LoggableBatch for &'a [Option] { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2_opt( self.iter() .map(|opt| opt.as_ref().map(|v| std::borrow::Cow::Borrowed(v))), @@ -240,7 +240,7 @@ impl<'a, C: Component> ComponentBatch for &'a [Option] { impl<'a, L: Loggable, const N: usize> LoggableBatch for &'a [L; N] { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2(self.iter().map(|v| std::borrow::Cow::Borrowed(v))) } } @@ -256,7 +256,7 @@ impl<'a, C: Component, const N: usize> ComponentBatch for &'a [C; N] { impl<'a, L: Loggable, const N: usize> LoggableBatch for &'a [Option; N] { #[inline] - fn to_arrow(&self) -> SerializationResult> { + fn to_arrow2(&self) -> SerializationResult> { L::to_arrow2_opt( self.iter() .map(|opt| opt.as_ref().map(|v| std::borrow::Cow::Borrowed(v))), diff --git a/crates/top/re_sdk/src/recording_stream.rs b/crates/top/re_sdk/src/recording_stream.rs index 2947b98e434e..131a2dca6941 100644 --- a/crates/top/re_sdk/src/recording_stream.rs +++ b/crates/top/re_sdk/src/recording_stream.rs @@ -1170,7 +1170,7 @@ impl RecordingStream { .into_iter() .map(|comp_batch| { comp_batch - .to_arrow() + .to_arrow2() .map(|array| (comp_batch.name(), array)) }) .collect(); diff --git a/crates/viewer/re_viewer/src/reflection/mod.rs b/crates/viewer/re_viewer/src/reflection/mod.rs index 3b30824de84b..1eca542ba12e 100644 --- a/crates/viewer/re_viewer/src/reflection/mod.rs +++ b/crates/viewer/re_viewer/src/reflection/mod.rs @@ -38,7 +38,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The active tab in a tabbed container.", - custom_placeholder: Some(ActiveTab::default().to_arrow()?), + custom_placeholder: Some(ActiveTab::default().to_arrow2()?), datatype: ActiveTab::arrow2_datatype(), }, ), @@ -46,7 +46,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Whether empty cells in a dataframe should be filled with a latest-at query.", - custom_placeholder: Some(ApplyLatestAt::default().to_arrow()?), + custom_placeholder: Some(ApplyLatestAt::default().to_arrow2()?), datatype: ApplyLatestAt::arrow2_datatype(), }, ), @@ -54,7 +54,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Whether the viewport layout is determined automatically.", - custom_placeholder: Some(AutoLayout::default().to_arrow()?), + custom_placeholder: Some(AutoLayout::default().to_arrow2()?), datatype: AutoLayout::arrow2_datatype(), }, ), @@ -62,7 +62,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Whether or not space views should be created automatically.", - custom_placeholder: Some(AutoSpaceViews::default().to_arrow()?), + custom_placeholder: Some(AutoSpaceViews::default().to_arrow2()?), datatype: AutoSpaceViews::arrow2_datatype(), }, ), @@ -70,7 +70,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The type of the background in a view.", - custom_placeholder: Some(BackgroundKind::default().to_arrow()?), + custom_placeholder: Some(BackgroundKind::default().to_arrow2()?), datatype: BackgroundKind::arrow2_datatype(), }, ), @@ -78,7 +78,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The layout share of a column in the container.", - custom_placeholder: Some(ColumnShare::default().to_arrow()?), + custom_placeholder: Some(ColumnShare::default().to_arrow2()?), datatype: ColumnShare::arrow2_datatype(), }, ), @@ -86,7 +86,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Describe a component column to be selected in the dataframe view.", - custom_placeholder: Some(ComponentColumnSelector::default().to_arrow()?), + custom_placeholder: Some(ComponentColumnSelector::default().to_arrow2()?), datatype: ComponentColumnSelector::arrow2_datatype(), }, ), @@ -94,7 +94,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The kind of a blueprint container (tabs, grid, …).", - custom_placeholder: Some(ContainerKind::default().to_arrow()?), + custom_placeholder: Some(ContainerKind::default().to_arrow2()?), datatype: ContainerKind::arrow2_datatype(), }, ), @@ -102,7 +102,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "One of four 2D corners, typically used to align objects.", - custom_placeholder: Some(Corner2D::default().to_arrow()?), + custom_placeholder: Some(Corner2D::default().to_arrow2()?), datatype: Corner2D::arrow2_datatype(), }, ), @@ -110,7 +110,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Configuration for a filter-by-range feature of the dataframe view.", - custom_placeholder: Some(FilterByRange::default().to_arrow()?), + custom_placeholder: Some(FilterByRange::default().to_arrow2()?), datatype: FilterByRange::arrow2_datatype(), }, ), @@ -118,7 +118,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Configuration for the filter is not null feature of the dataframe view.", - custom_placeholder: Some(FilterIsNotNull::default().to_arrow()?), + custom_placeholder: Some(FilterIsNotNull::default().to_arrow2()?), datatype: FilterIsNotNull::arrow2_datatype(), }, ), @@ -126,7 +126,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "How many columns a grid container should have.", - custom_placeholder: Some(GridColumns::default().to_arrow()?), + custom_placeholder: Some(GridColumns::default().to_arrow2()?), datatype: GridColumns::arrow2_datatype(), }, ), @@ -134,7 +134,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "All the contents in the container.", - custom_placeholder: Some(IncludedContent::default().to_arrow()?), + custom_placeholder: Some(IncludedContent::default().to_arrow2()?), datatype: IncludedContent::arrow2_datatype(), }, ), @@ -142,7 +142,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The unique id of a space view, used to refer to views in containers.", - custom_placeholder: Some(IncludedSpaceView::default().to_arrow()?), + custom_placeholder: Some(IncludedSpaceView::default().to_arrow2()?), datatype: IncludedSpaceView::arrow2_datatype(), }, ), @@ -150,7 +150,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Whether the entity can be interacted with.\n\nNon interactive components are still visible, but mouse interactions in the view are disabled.", - custom_placeholder: Some(Interactive::default().to_arrow()?), + custom_placeholder: Some(Interactive::default().to_arrow2()?), datatype: Interactive::arrow2_datatype(), }, ), @@ -158,7 +158,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Indicate whether the range should be locked when zooming in on the data.\n\nDefault is `false`, i.e. zoom will change the visualized range.", - custom_placeholder: Some(LockRangeDuringZoom::default().to_arrow()?), + custom_placeholder: Some(LockRangeDuringZoom::default().to_arrow2()?), datatype: LockRangeDuringZoom::arrow2_datatype(), }, ), @@ -166,7 +166,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Name of the map provider to be used in Map views.", - custom_placeholder: Some(MapProvider::default().to_arrow()?), + custom_placeholder: Some(MapProvider::default().to_arrow2()?), datatype: MapProvider::arrow2_datatype(), }, ), @@ -174,7 +174,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Tri-state for panel controls.", - custom_placeholder: Some(PanelState::default().to_arrow()?), + custom_placeholder: Some(PanelState::default().to_arrow2()?), datatype: PanelState::arrow2_datatype(), }, ), @@ -182,7 +182,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "An individual query expression used to filter a set of [`datatypes.EntityPath`](https://rerun.io/docs/reference/types/datatypes/entity_path)s.\n\nEach expression is either an inclusion or an exclusion expression.\nInclusions start with an optional `+` and exclusions must start with a `-`.\n\nMultiple expressions are combined together as part of `SpaceViewContents`.\n\nThe `/**` suffix matches the whole subtree, i.e. self and any child, recursively\n(`/world/**` matches both `/world` and `/world/car/driver`).\nOther uses of `*` are not (yet) supported.", - custom_placeholder: Some(QueryExpression::default().to_arrow()?), + custom_placeholder: Some(QueryExpression::default().to_arrow2()?), datatype: QueryExpression::arrow2_datatype(), }, ), @@ -190,7 +190,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The container that sits at the root of a viewport.", - custom_placeholder: Some(RootContainer::default().to_arrow()?), + custom_placeholder: Some(RootContainer::default().to_arrow2()?), datatype: RootContainer::arrow2_datatype(), }, ), @@ -198,7 +198,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The layout share of a row in the container.", - custom_placeholder: Some(RowShare::default().to_arrow()?), + custom_placeholder: Some(RowShare::default().to_arrow2()?), datatype: RowShare::arrow2_datatype(), }, ), @@ -206,7 +206,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Describe a component column to be selected in the dataframe view.", - custom_placeholder: Some(SelectedColumns::default().to_arrow()?), + custom_placeholder: Some(SelectedColumns::default().to_arrow2()?), datatype: SelectedColumns::arrow2_datatype(), }, ), @@ -214,7 +214,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The class identifier of view, e.g. `\"2D\"`, `\"TextLog\"`, ….", - custom_placeholder: Some(SpaceViewClass::default().to_arrow()?), + custom_placeholder: Some(SpaceViewClass::default().to_arrow2()?), datatype: SpaceViewClass::arrow2_datatype(), }, ), @@ -222,7 +222,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Whether a space view is maximized.", - custom_placeholder: Some(SpaceViewMaximized::default().to_arrow()?), + custom_placeholder: Some(SpaceViewMaximized::default().to_arrow2()?), datatype: SpaceViewMaximized::arrow2_datatype(), }, ), @@ -230,7 +230,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The origin of a `SpaceView`.", - custom_placeholder: Some(SpaceViewOrigin::default().to_arrow()?), + custom_placeholder: Some(SpaceViewOrigin::default().to_arrow2()?), datatype: SpaceViewOrigin::arrow2_datatype(), }, ), @@ -239,7 +239,7 @@ fn generate_component_reflection() -> Result Result::name(), ComponentReflection { docstring_md: "A timeline identified by its name.", - custom_placeholder: Some(TimelineName::default().to_arrow()?), + custom_placeholder: Some(TimelineName::default().to_arrow2()?), datatype: TimelineName::arrow2_datatype(), }, ), @@ -256,7 +256,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Determines whether an image or texture should be scaled to fit the viewport.", - custom_placeholder: Some(ViewFit::default().to_arrow()?), + custom_placeholder: Some(ViewFit::default().to_arrow2()?), datatype: ViewFit::arrow2_datatype(), }, ), @@ -265,7 +265,7 @@ fn generate_component_reflection() -> Result Result::name(), ComponentReflection { docstring_md: "Whether the container, view, entity or instance is currently visible.", - custom_placeholder: Some(Visible::default().to_arrow()?), + custom_placeholder: Some(Visible::default().to_arrow2()?), datatype: Visible::arrow2_datatype(), }, ), @@ -282,7 +282,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The range of values on a given timeline that will be included in a view's query.\n\nRefer to `VisibleTimeRanges` archetype for more information.", - custom_placeholder: Some(VisibleTimeRange::default().to_arrow()?), + custom_placeholder: Some(VisibleTimeRange::default().to_arrow2()?), datatype: VisibleTimeRange::arrow2_datatype(), }, ), @@ -290,7 +290,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Visual bounds in 2D space used for `Spatial2DView`.", - custom_placeholder: Some(VisualBounds2D::default().to_arrow()?), + custom_placeholder: Some(VisualBounds2D::default().to_arrow2()?), datatype: VisualBounds2D::arrow2_datatype(), }, ), @@ -298,7 +298,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Override the visualizers for an entity.\n\nThis component is a stop-gap mechanism based on the current implementation details\nof the visualizer system. It is not intended to be a long-term solution, but provides\nenough utility to be useful in the short term.\n\nThe long-term solution is likely to be based off: \n\nThis can only be used as part of blueprints. It will have no effect if used\nin a regular entity.", - custom_placeholder: Some(VisualizerOverrides::default().to_arrow()?), + custom_placeholder: Some(VisualizerOverrides::default().to_arrow2()?), datatype: VisualizerOverrides::arrow2_datatype(), }, ), @@ -306,7 +306,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A zoom level determines how much of the world is visible on a map.", - custom_placeholder: Some(ZoomLevel::default().to_arrow()?), + custom_placeholder: Some(ZoomLevel::default().to_arrow2()?), datatype: ZoomLevel::arrow2_datatype(), }, ), @@ -314,7 +314,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Policy for aggregation of multiple scalar plot values.\n\nThis is used for lines in plots when the X axis distance of individual points goes below a single pixel,\ni.e. a single pixel covers more than one tick worth of data. It can greatly improve performance\n(and readability) in such situations as it prevents overdraw.", - custom_placeholder: Some(AggregationPolicy::default().to_arrow()?), + custom_placeholder: Some(AggregationPolicy::default().to_arrow2()?), datatype: AggregationPolicy::arrow2_datatype(), }, ), @@ -322,7 +322,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A color multiplier, usually applied to a whole entity, e.g. a mesh.", - custom_placeholder: Some(AlbedoFactor::default().to_arrow()?), + custom_placeholder: Some(AlbedoFactor::default().to_arrow2()?), datatype: AlbedoFactor::arrow2_datatype(), }, ), @@ -330,7 +330,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The annotation context provides additional information on how to display entities.\n\nEntities can use [`datatypes.ClassId`](https://rerun.io/docs/reference/types/datatypes/class_id)s and [`datatypes.KeypointId`](https://rerun.io/docs/reference/types/datatypes/keypoint_id)s to provide annotations, and\nthe labels and colors will be looked up in the appropriate\nannotation context. We use the *first* annotation context we find in the\npath-hierarchy when searching up through the ancestors of a given entity\npath.", - custom_placeholder: Some(AnnotationContext::default().to_arrow()?), + custom_placeholder: Some(AnnotationContext::default().to_arrow2()?), datatype: AnnotationContext::arrow2_datatype(), }, ), @@ -338,7 +338,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The length of an axis in local units of the space.", - custom_placeholder: Some(AxisLength::default().to_arrow()?), + custom_placeholder: Some(AxisLength::default().to_arrow2()?), datatype: AxisLength::arrow2_datatype(), }, ), @@ -354,7 +354,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 16-bit ID representing a type of semantic class.", - custom_placeholder: Some(ClassId::default().to_arrow()?), + custom_placeholder: Some(ClassId::default().to_arrow2()?), datatype: ClassId::arrow2_datatype(), }, ), @@ -362,7 +362,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Configures how a clear operation should behave - recursive or not.", - custom_placeholder: Some(ClearIsRecursive::default().to_arrow()?), + custom_placeholder: Some(ClearIsRecursive::default().to_arrow2()?), datatype: ClearIsRecursive::arrow2_datatype(), }, ), @@ -370,7 +370,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "An RGBA color with unmultiplied/separate alpha, in sRGB gamma space with linear alpha.\n\nThe color is stored as a 32-bit integer, where the most significant\nbyte is `R` and the least significant byte is `A`.", - custom_placeholder: Some(Color::default().to_arrow()?), + custom_placeholder: Some(Color::default().to_arrow2()?), datatype: Color::arrow2_datatype(), }, ), @@ -378,7 +378,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Colormap for mapping scalar values within a given range to a color.\n\nThis provides a number of popular pre-defined colormaps.\nIn the future, the Rerun Viewer will allow users to define their own colormaps,\nbut currently the Viewer is limited to the types defined here.", - custom_placeholder: Some(Colormap::default().to_arrow()?), + custom_placeholder: Some(Colormap::default().to_arrow2()?), datatype: Colormap::arrow2_datatype(), }, ), @@ -386,7 +386,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The world->depth map scaling factor.\n\nThis measures how many depth map units are in a world unit.\nFor instance, if a depth map uses millimeters and the world uses meters,\nthis value would be `1000`.\n\nNote that the only effect on 2D views is the physical depth values shown when hovering the image.\nIn 3D views on the other hand, this affects where the points of the point cloud are placed.", - custom_placeholder: Some(DepthMeter::default().to_arrow()?), + custom_placeholder: Some(DepthMeter::default().to_arrow2()?), datatype: DepthMeter::arrow2_datatype(), }, ), @@ -394,7 +394,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Spatially disconnect this entity from its parent.\n\nSpecifies that the entity path at which this is logged is spatially disconnected from its parent,\nmaking it impossible to transform the entity path into its parent's space and vice versa.\nIt *only* applies to space views that work with spatial transformations, i.e. 2D & 3D space views.\nThis is useful for specifying that a subgraph is independent of the rest of the scene.", - custom_placeholder: Some(DisconnectedSpace::default().to_arrow()?), + custom_placeholder: Some(DisconnectedSpace::default().to_arrow2()?), datatype: DisconnectedSpace::arrow2_datatype(), }, ), @@ -402,7 +402,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Draw order of 2D elements. Higher values are drawn on top of lower values.\n\nAn entity can have only a single draw order component.\nWithin an entity draw order is governed by the order of the components.\n\nDraw order for entities with the same draw order is generally undefined.", - custom_placeholder: Some(DrawOrder::default().to_arrow()?), + custom_placeholder: Some(DrawOrder::default().to_arrow2()?), datatype: DrawOrder::arrow2_datatype(), }, ), @@ -410,7 +410,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A path to an entity, usually to reference some data that is part of the target entity.", - custom_placeholder: Some(EntityPath::default().to_arrow()?), + custom_placeholder: Some(EntityPath::default().to_arrow2()?), datatype: EntityPath::arrow2_datatype(), }, ), @@ -418,7 +418,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "How a geometric shape is drawn and colored.", - custom_placeholder: Some(FillMode::default().to_arrow()?), + custom_placeholder: Some(FillMode::default().to_arrow2()?), datatype: FillMode::arrow2_datatype(), }, ), @@ -426,7 +426,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "How much a primitive fills out the available space.\n\nUsed for instance to scale the points of the point cloud created from [`archetypes.DepthImage`](https://rerun.io/docs/reference/types/archetypes/depth_image) projection in 3D views.\nValid range is from 0 to max float although typically values above 1.0 are not useful.\n\nDefaults to 1.0.", - custom_placeholder: Some(FillRatio::default().to_arrow()?), + custom_placeholder: Some(FillRatio::default().to_arrow2()?), datatype: FillRatio::arrow2_datatype(), }, ), @@ -434,7 +434,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A gamma correction value to be used with a scalar value or color.\n\nUsed to adjust the gamma of a color or scalar value between 0 and 1 before rendering.\n`new_value = old_value ^ gamma`\n\nValid range is from 0 (excluding) to max float.\nDefaults to 1.0 unless otherwise specified.", - custom_placeholder: Some(GammaCorrection::default().to_arrow()?), + custom_placeholder: Some(GammaCorrection::default().to_arrow2()?), datatype: GammaCorrection::arrow2_datatype(), }, ), @@ -442,7 +442,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A geospatial line string expressed in [EPSG:4326](https://epsg.io/4326) latitude and longitude (North/East-positive degrees).", - custom_placeholder: Some(GeoLineString::default().to_arrow()?), + custom_placeholder: Some(GeoLineString::default().to_arrow2()?), datatype: GeoLineString::arrow2_datatype(), }, ), @@ -450,7 +450,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Half-size (radius) of a 2D box.\n\nMeasured in its local coordinate system.\n\nThe box extends both in negative and positive direction along each axis.\nNegative sizes indicate that the box is flipped along the respective axis, but this has no effect on how it is displayed.", - custom_placeholder: Some(HalfSize2D::default().to_arrow()?), + custom_placeholder: Some(HalfSize2D::default().to_arrow2()?), datatype: HalfSize2D::arrow2_datatype(), }, ), @@ -458,7 +458,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Half-size (radius) of a 3D box.\n\nMeasured in its local coordinate system.\n\nThe box extends both in negative and positive direction along each axis.\nNegative sizes indicate that the box is flipped along the respective axis, but this has no effect on how it is displayed.", - custom_placeholder: Some(HalfSize3D::default().to_arrow()?), + custom_placeholder: Some(HalfSize3D::default().to_arrow2()?), datatype: HalfSize3D::arrow2_datatype(), }, ), @@ -474,7 +474,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The metadata describing the contents of a [`components.ImageBuffer`](https://rerun.io/docs/reference/types/components/image_buffer).", - custom_placeholder: Some(ImageFormat::default().to_arrow()?), + custom_placeholder: Some(ImageFormat::default().to_arrow2()?), datatype: ImageFormat::arrow2_datatype(), }, ), @@ -482,7 +482,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The distance from the camera origin to the image plane when the projection is shown in a 3D viewer.\n\nThis is only used for visualization purposes, and does not affect the projection itself.", - custom_placeholder: Some(ImagePlaneDistance::default().to_arrow()?), + custom_placeholder: Some(ImagePlaneDistance::default().to_arrow2()?), datatype: ImagePlaneDistance::arrow2_datatype(), }, ), @@ -490,7 +490,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 16-bit ID representing a type of semantic keypoint within a class.", - custom_placeholder: Some(KeypointId::default().to_arrow()?), + custom_placeholder: Some(KeypointId::default().to_arrow2()?), datatype: KeypointId::arrow2_datatype(), }, ), @@ -498,7 +498,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A geospatial position expressed in [EPSG:4326](https://epsg.io/4326) latitude and longitude (North/East-positive degrees).", - custom_placeholder: Some(LatLon::default().to_arrow()?), + custom_placeholder: Some(LatLon::default().to_arrow2()?), datatype: LatLon::arrow2_datatype(), }, ), @@ -506,7 +506,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Length, or one-dimensional size.\n\nMeasured in its local coordinate system; consult the archetype in use to determine which\naxis or part of the entity this is the length of.", - custom_placeholder: Some(Length::default().to_arrow()?), + custom_placeholder: Some(Length::default().to_arrow2()?), datatype: Length::arrow2_datatype(), }, ), @@ -514,7 +514,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A line strip in 2D space.\n\nA line strip is a list of points connected by line segments. It can be used to draw\napproximations of smooth curves.\n\nThe points will be connected in order, like so:\n```text\n 2------3 5\n / \\ /\n0----1 \\ /\n 4\n```", - custom_placeholder: Some(LineStrip2D::default().to_arrow()?), + custom_placeholder: Some(LineStrip2D::default().to_arrow2()?), datatype: LineStrip2D::arrow2_datatype(), }, ), @@ -522,7 +522,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A line strip in 3D space.\n\nA line strip is a list of points connected by line segments. It can be used to draw\napproximations of smooth curves.\n\nThe points will be connected in order, like so:\n```text\n 2------3 5\n / \\ /\n0----1 \\ /\n 4\n```", - custom_placeholder: Some(LineStrip3D::default().to_arrow()?), + custom_placeholder: Some(LineStrip3D::default().to_arrow2()?), datatype: LineStrip3D::arrow2_datatype(), }, ), @@ -530,7 +530,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Filter used when magnifying an image/texture such that a single pixel/texel is displayed as multiple pixels on screen.", - custom_placeholder: Some(MagnificationFilter::default().to_arrow()?), + custom_placeholder: Some(MagnificationFilter::default().to_arrow2()?), datatype: MagnificationFilter::arrow2_datatype(), }, ), @@ -538,7 +538,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The visual appearance of a point in e.g. a 2D plot.", - custom_placeholder: Some(MarkerShape::default().to_arrow()?), + custom_placeholder: Some(MarkerShape::default().to_arrow2()?), datatype: MarkerShape::arrow2_datatype(), }, ), @@ -546,7 +546,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Radius of a marker of a point in e.g. a 2D plot, measured in UI points.", - custom_placeholder: Some(MarkerSize::default().to_arrow()?), + custom_placeholder: Some(MarkerSize::default().to_arrow2()?), datatype: MarkerSize::arrow2_datatype(), }, ), @@ -554,7 +554,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A standardized media type (RFC2046, formerly known as MIME types), encoded as a string.\n\nThe complete reference of officially registered media types is maintained by the IANA and can be\nconsulted at .", - custom_placeholder: Some(MediaType::default().to_arrow()?), + custom_placeholder: Some(MediaType::default().to_arrow2()?), datatype: MediaType::arrow2_datatype(), }, ), @@ -562,7 +562,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A display name, typically for an entity or a item like a plot series.", - custom_placeholder: Some(Name::default().to_arrow()?), + custom_placeholder: Some(Name::default().to_arrow2()?), datatype: Name::arrow2_datatype(), }, ), @@ -570,7 +570,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Degree of transparency ranging from 0.0 (fully transparent) to 1.0 (fully opaque).\n\nThe final opacity value may be a result of multiplication with alpha values as specified by other color sources.\nUnless otherwise specified, the default value is 1.", - custom_placeholder: Some(Opacity::default().to_arrow()?), + custom_placeholder: Some(Opacity::default().to_arrow2()?), datatype: Opacity::arrow2_datatype(), }, ), @@ -578,7 +578,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Camera projection, from image coordinates to view coordinates.\n\nChild from parent.\nImage coordinates from camera view coordinates.\n\nExample:\n```text\n1496.1 0.0 980.5\n 0.0 1496.1 744.5\n 0.0 0.0 1.0\n```", - custom_placeholder: Some(PinholeProjection::default().to_arrow()?), + custom_placeholder: Some(PinholeProjection::default().to_arrow2()?), datatype: PinholeProjection::arrow2_datatype(), }, ), @@ -586,7 +586,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "3D rotation represented by a rotation around a given axis that doesn't propagate in the transform hierarchy.", - custom_placeholder: Some(PoseRotationAxisAngle::default().to_arrow()?), + custom_placeholder: Some(PoseRotationAxisAngle::default().to_arrow2()?), datatype: PoseRotationAxisAngle::arrow2_datatype(), }, ), @@ -594,7 +594,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 3D rotation expressed as a quaternion that doesn't propagate in the transform hierarchy.\n\nNote: although the x,y,z,w components of the quaternion will be passed through to the\ndatastore as provided, when used in the Viewer, quaternions will always be normalized.", - custom_placeholder: Some(PoseRotationQuat::default().to_arrow()?), + custom_placeholder: Some(PoseRotationQuat::default().to_arrow2()?), datatype: PoseRotationQuat::arrow2_datatype(), }, ), @@ -602,7 +602,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 3D scale factor that doesn't propagate in the transform hierarchy.\n\nA scale of 1.0 means no scaling.\nA scale of 2.0 means doubling the size.\nEach component scales along the corresponding axis.", - custom_placeholder: Some(PoseScale3D::default().to_arrow()?), + custom_placeholder: Some(PoseScale3D::default().to_arrow2()?), datatype: PoseScale3D::arrow2_datatype(), }, ), @@ -610,7 +610,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 3x3 transformation matrix Matrix that doesn't propagate in the transform hierarchy.\n\n3x3 matrixes are able to represent any affine transformation in 3D space,\ni.e. rotation, scaling, shearing, reflection etc.\n\nMatrices in Rerun are stored as flat list of coefficients in column-major order:\n```text\n column 0 column 1 column 2\n -------------------------------------------------\nrow 0 | flat_columns[0] flat_columns[3] flat_columns[6]\nrow 1 | flat_columns[1] flat_columns[4] flat_columns[7]\nrow 2 | flat_columns[2] flat_columns[5] flat_columns[8]\n```", - custom_placeholder: Some(PoseTransformMat3x3::default().to_arrow()?), + custom_placeholder: Some(PoseTransformMat3x3::default().to_arrow2()?), datatype: PoseTransformMat3x3::arrow2_datatype(), }, ), @@ -618,7 +618,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A translation vector in 3D space that doesn't propagate in the transform hierarchy.", - custom_placeholder: Some(PoseTranslation3D::default().to_arrow()?), + custom_placeholder: Some(PoseTranslation3D::default().to_arrow2()?), datatype: PoseTranslation3D::arrow2_datatype(), }, ), @@ -626,7 +626,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A position in 2D space.", - custom_placeholder: Some(Position2D::default().to_arrow()?), + custom_placeholder: Some(Position2D::default().to_arrow2()?), datatype: Position2D::arrow2_datatype(), }, ), @@ -634,7 +634,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A position in 3D space.", - custom_placeholder: Some(Position3D::default().to_arrow()?), + custom_placeholder: Some(Position3D::default().to_arrow2()?), datatype: Position3D::arrow2_datatype(), }, ), @@ -642,7 +642,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The radius of something, e.g. a point.\n\nInternally, positive values indicate scene units, whereas negative values\nare interpreted as UI points.\n\nUI points are independent of zooming in Views, but are sensitive to the application UI scaling.\nat 100% UI scaling, UI points are equal to pixels\nThe Viewer's UI scaling defaults to the OS scaling which typically is 100% for full HD screens and 200% for 4k screens.", - custom_placeholder: Some(Radius::default().to_arrow()?), + custom_placeholder: Some(Radius::default().to_arrow2()?), datatype: Radius::arrow2_datatype(), }, ), @@ -650,7 +650,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 1D range, specifying a lower and upper bound.", - custom_placeholder: Some(Range1D::default().to_arrow()?), + custom_placeholder: Some(Range1D::default().to_arrow2()?), datatype: Range1D::arrow2_datatype(), }, ), @@ -658,7 +658,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Pixel resolution width & height, e.g. of a camera sensor.\n\nTypically in integer units, but for some use cases floating point may be used.", - custom_placeholder: Some(Resolution::default().to_arrow()?), + custom_placeholder: Some(Resolution::default().to_arrow2()?), datatype: Resolution::arrow2_datatype(), }, ), @@ -666,7 +666,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "3D rotation represented by a rotation around a given axis.", - custom_placeholder: Some(RotationAxisAngle::default().to_arrow()?), + custom_placeholder: Some(RotationAxisAngle::default().to_arrow2()?), datatype: RotationAxisAngle::arrow2_datatype(), }, ), @@ -674,7 +674,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 3D rotation expressed as a quaternion.\n\nNote: although the x,y,z,w components of the quaternion will be passed through to the\ndatastore as provided, when used in the Viewer, quaternions will always be normalized.", - custom_placeholder: Some(RotationQuat::default().to_arrow()?), + custom_placeholder: Some(RotationQuat::default().to_arrow2()?), datatype: RotationQuat::arrow2_datatype(), }, ), @@ -682,7 +682,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A scalar value, encoded as a 64-bit floating point.\n\nUsed for time series plots.", - custom_placeholder: Some(Scalar::default().to_arrow()?), + custom_placeholder: Some(Scalar::default().to_arrow2()?), datatype: Scalar::arrow2_datatype(), }, ), @@ -690,7 +690,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 3D scale factor.\n\nA scale of 1.0 means no scaling.\nA scale of 2.0 means doubling the size.\nEach component scales along the corresponding axis.", - custom_placeholder: Some(Scale3D::default().to_arrow()?), + custom_placeholder: Some(Scale3D::default().to_arrow2()?), datatype: Scale3D::arrow2_datatype(), }, ), @@ -706,7 +706,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The width of a stroke specified in UI points.", - custom_placeholder: Some(StrokeWidth::default().to_arrow()?), + custom_placeholder: Some(StrokeWidth::default().to_arrow2()?), datatype: StrokeWidth::arrow2_datatype(), }, ), @@ -714,7 +714,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "An N-dimensional array of numbers.\n\nThe number of dimensions and their respective lengths is specified by the `shape` field.\nThe dimensions are ordered from outermost to innermost. For example, in the common case of\na 2D RGB Image, the shape would be `[height, width, channel]`.\n\nThese dimensions are combined with an index to look up values from the `buffer` field,\nwhich stores a contiguous array of typed values.", - custom_placeholder: Some(TensorData::default().to_arrow()?), + custom_placeholder: Some(TensorData::default().to_arrow2()?), datatype: TensorData::arrow2_datatype(), }, ), @@ -723,7 +723,7 @@ fn generate_component_reflection() -> Result Result::name(), ComponentReflection { docstring_md: "Specifies which dimension to use for height.", - custom_placeholder: Some(TensorHeightDimension::default().to_arrow()?), + custom_placeholder: Some(TensorHeightDimension::default().to_arrow2()?), datatype: TensorHeightDimension::arrow2_datatype(), }, ), @@ -740,7 +740,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Specifies which dimension to use for width.", - custom_placeholder: Some(TensorWidthDimension::default().to_arrow()?), + custom_placeholder: Some(TensorWidthDimension::default().to_arrow2()?), datatype: TensorWidthDimension::arrow2_datatype(), }, ), @@ -748,7 +748,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 2D texture UV coordinate.\n\nTexture coordinates specify a position on a 2D texture.\nA range from 0-1 covers the entire texture in the respective dimension.\nUnless configured otherwise, the texture repeats outside of this range.\nRerun uses top-left as the origin for UV coordinates.\n\n 0 U 1\n0 + --------- →\n | .\nV | .\n | .\n1 ↓ . . . . . .\n\nThis is the same convention as in Vulkan/Metal/DX12/WebGPU, but (!) unlike OpenGL,\nwhich places the origin at the bottom-left.", - custom_placeholder: Some(Texcoord2D::default().to_arrow()?), + custom_placeholder: Some(Texcoord2D::default().to_arrow2()?), datatype: Texcoord2D::arrow2_datatype(), }, ), @@ -756,7 +756,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A string of text, e.g. for labels and text documents.", - custom_placeholder: Some(Text::default().to_arrow()?), + custom_placeholder: Some(Text::default().to_arrow2()?), datatype: Text::arrow2_datatype(), }, ), @@ -764,7 +764,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The severity level of a text log message.\n\nRecommended to be one of:\n* `\"CRITICAL\"`\n* `\"ERROR\"`\n* `\"WARN\"`\n* `\"INFO\"`\n* `\"DEBUG\"`\n* `\"TRACE\"`", - custom_placeholder: Some(TextLogLevel::default().to_arrow()?), + custom_placeholder: Some(TextLogLevel::default().to_arrow2()?), datatype: TextLogLevel::arrow2_datatype(), }, ), @@ -772,7 +772,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A 3x3 transformation matrix Matrix.\n\n3x3 matrixes are able to represent any affine transformation in 3D space,\ni.e. rotation, scaling, shearing, reflection etc.\n\nMatrices in Rerun are stored as flat list of coefficients in column-major order:\n```text\n column 0 column 1 column 2\n -------------------------------------------------\nrow 0 | flat_columns[0] flat_columns[3] flat_columns[6]\nrow 1 | flat_columns[1] flat_columns[4] flat_columns[7]\nrow 2 | flat_columns[2] flat_columns[5] flat_columns[8]\n```", - custom_placeholder: Some(TransformMat3x3::default().to_arrow()?), + custom_placeholder: Some(TransformMat3x3::default().to_arrow2()?), datatype: TransformMat3x3::arrow2_datatype(), }, ), @@ -780,7 +780,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Specifies relation a spatial transform describes.", - custom_placeholder: Some(TransformRelation::default().to_arrow()?), + custom_placeholder: Some(TransformRelation::default().to_arrow2()?), datatype: TransformRelation::arrow2_datatype(), }, ), @@ -788,7 +788,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A translation vector in 3D space.", - custom_placeholder: Some(Translation3D::default().to_arrow()?), + custom_placeholder: Some(Translation3D::default().to_arrow2()?), datatype: Translation3D::arrow2_datatype(), }, ), @@ -796,7 +796,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "The three indices of a triangle in a triangle mesh.", - custom_placeholder: Some(TriangleIndices::default().to_arrow()?), + custom_placeholder: Some(TriangleIndices::default().to_arrow2()?), datatype: TriangleIndices::arrow2_datatype(), }, ), @@ -804,7 +804,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Range of expected or valid values, specifying a lower and upper bound.", - custom_placeholder: Some(ValueRange::default().to_arrow()?), + custom_placeholder: Some(ValueRange::default().to_arrow2()?), datatype: ValueRange::arrow2_datatype(), }, ), @@ -812,7 +812,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A vector in 2D space.", - custom_placeholder: Some(Vector2D::default().to_arrow()?), + custom_placeholder: Some(Vector2D::default().to_arrow2()?), datatype: Vector2D::arrow2_datatype(), }, ), @@ -820,7 +820,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "A vector in 3D space.", - custom_placeholder: Some(Vector3D::default().to_arrow()?), + custom_placeholder: Some(Vector3D::default().to_arrow2()?), datatype: Vector3D::arrow2_datatype(), }, ), @@ -828,7 +828,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "Timestamp inside a [`archetypes.AssetVideo`](https://rerun.io/docs/reference/types/archetypes/asset_video).", - custom_placeholder: Some(VideoTimestamp::default().to_arrow()?), + custom_placeholder: Some(VideoTimestamp::default().to_arrow2()?), datatype: VideoTimestamp::arrow2_datatype(), }, ), @@ -836,7 +836,7 @@ fn generate_component_reflection() -> Result::name(), ComponentReflection { docstring_md: "How we interpret the coordinate system of an entity/space.\n\nFor instance: What is \"up\"? What does the Z axis mean?\n\nThe three coordinates are always ordered as [x, y, z].\n\nFor example [Right, Down, Forward] means that the X axis points to the right, the Y axis points\ndown, and the Z axis points forward.\n\n⚠ [Rerun does not yet support left-handed coordinate systems](https://github.com/rerun-io/rerun/issues/5032).\n\nThe following constants are used to represent the different directions:\n * Up = 1\n * Down = 2\n * Right = 3\n * Left = 4\n * Forward = 5\n * Back = 6", - custom_placeholder: Some(ViewCoordinates::default().to_arrow()?), + custom_placeholder: Some(ViewCoordinates::default().to_arrow2()?), datatype: ViewCoordinates::arrow2_datatype(), }, ), diff --git a/crates/viewer/re_viewer_context/src/component_fallbacks.rs b/crates/viewer/re_viewer_context/src/component_fallbacks.rs index 26f357e30a83..59993c6680db 100644 --- a/crates/viewer/re_viewer_context/src/component_fallbacks.rs +++ b/crates/viewer/re_viewer_context/src/component_fallbacks.rs @@ -20,7 +20,7 @@ pub enum ComponentFallbackProviderResult { impl From for ComponentFallbackProviderResult { fn from(batch: T) -> Self { - match batch.to_arrow() { + match batch.to_arrow2() { Ok(value) => Self::Value(value), Err(err) => Self::SerializationError(err), } diff --git a/crates/viewer/re_viewer_context/src/component_ui_registry.rs b/crates/viewer/re_viewer_context/src/component_ui_registry.rs index 4b79b7c92b52..6898c448451c 100644 --- a/crates/viewer/re_viewer_context/src/component_ui_registry.rs +++ b/crates/viewer/re_viewer_context/src/component_ui_registry.rs @@ -354,7 +354,7 @@ impl ComponentUiRegistry { if response.changed() { use re_types::LoggableBatch as _; - deserialized_value.to_arrow().ok_or_log_error_once() + deserialized_value.to_arrow2().ok_or_log_error_once() } else { None }