From 10cbe6187f77b62d8160397f4d8c9a550dedcec5 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Mon, 6 Jan 2025 22:09:14 +0100
Subject: [PATCH] Use arrow1 datatype in reflection

---
 .../src/codegen/rust/reflection.rs            |   2 +-
 crates/store/re_types/src/reflection/mod.rs   | 218 +++++++++---------
 crates/store/re_types_core/src/reflection.rs  |  18 +-
 .../re_viewer_context/src/viewer_context.rs   |   9 +-
 4 files changed, 126 insertions(+), 121 deletions(-)

diff --git a/crates/build/re_types_builder/src/codegen/rust/reflection.rs b/crates/build/re_types_builder/src/codegen/rust/reflection.rs
index 191dde948f92..8c86c4e37641 100644
--- a/crates/build/re_types_builder/src/codegen/rust/reflection.rs
+++ b/crates/build/re_types_builder/src/codegen/rust/reflection.rs
@@ -146,7 +146,7 @@ fn generate_component_reflection(
             ComponentReflection {
                 docstring_md: #docstring_md,
                 custom_placeholder: #custom_placeholder,
-                datatype: #type_name::arrow2_datatype(),
+                datatype: #type_name::arrow_datatype(),
             }
         };
         quoted_pairs.push(quote! { (#quoted_name, #quoted_reflection) });
diff --git a/crates/store/re_types/src/reflection/mod.rs b/crates/store/re_types/src/reflection/mod.rs
index 31cc885c6114..bbc5cc219b2b 100644
--- a/crates/store/re_types/src/reflection/mod.rs
+++ b/crates/store/re_types/src/reflection/mod.rs
@@ -38,7 +38,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The active tab in a tabbed container.",
                 custom_placeholder: Some(ActiveTab::default().to_arrow()?),
-                datatype: ActiveTab::arrow2_datatype(),
+                datatype: ActiveTab::arrow_datatype(),
             },
         ),
         (
@@ -46,7 +46,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether empty cells in a dataframe should be filled with a latest-at query.",
                 custom_placeholder: Some(ApplyLatestAt::default().to_arrow()?),
-                datatype: ApplyLatestAt::arrow2_datatype(),
+                datatype: ApplyLatestAt::arrow_datatype(),
             },
         ),
         (
@@ -54,7 +54,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether the viewport layout is determined automatically.",
                 custom_placeholder: Some(AutoLayout::default().to_arrow()?),
-                datatype: AutoLayout::arrow2_datatype(),
+                datatype: AutoLayout::arrow_datatype(),
             },
         ),
         (
@@ -62,7 +62,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether or not views should be created automatically.",
                 custom_placeholder: Some(AutoViews::default().to_arrow()?),
-                datatype: AutoViews::arrow2_datatype(),
+                datatype: AutoViews::arrow_datatype(),
             },
         ),
         (
@@ -70,7 +70,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The type of the background in a view.",
                 custom_placeholder: Some(BackgroundKind::default().to_arrow()?),
-                datatype: BackgroundKind::arrow2_datatype(),
+                datatype: BackgroundKind::arrow_datatype(),
             },
         ),
         (
@@ -78,7 +78,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The layout share of a column in the container.",
                 custom_placeholder: Some(ColumnShare::default().to_arrow()?),
-                datatype: ColumnShare::arrow2_datatype(),
+                datatype: ColumnShare::arrow_datatype(),
             },
         ),
         (
@@ -86,7 +86,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Describe a component column to be selected in the dataframe view.",
                 custom_placeholder: Some(ComponentColumnSelector::default().to_arrow()?),
-                datatype: ComponentColumnSelector::arrow2_datatype(),
+                datatype: ComponentColumnSelector::arrow_datatype(),
             },
         ),
         (
@@ -94,7 +94,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The kind of a blueprint container (tabs, grid, …).",
                 custom_placeholder: Some(ContainerKind::default().to_arrow()?),
-                datatype: ContainerKind::arrow2_datatype(),
+                datatype: ContainerKind::arrow_datatype(),
             },
         ),
         (
@@ -102,7 +102,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "One of four 2D corners, typically used to align objects.",
                 custom_placeholder: Some(Corner2D::default().to_arrow()?),
-                datatype: Corner2D::arrow2_datatype(),
+                datatype: Corner2D::arrow_datatype(),
             },
         ),
         (
@@ -110,7 +110,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether a procedure is enabled.",
                 custom_placeholder: Some(Enabled::default().to_arrow()?),
-                datatype: Enabled::arrow2_datatype(),
+                datatype: Enabled::arrow_datatype(),
             },
         ),
         (
@@ -118,7 +118,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Configuration for a filter-by-range feature of the dataframe view.",
                 custom_placeholder: Some(FilterByRange::default().to_arrow()?),
-                datatype: FilterByRange::arrow2_datatype(),
+                datatype: FilterByRange::arrow_datatype(),
             },
         ),
         (
@@ -126,7 +126,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Configuration for the filter is not null feature of the dataframe view.",
                 custom_placeholder: Some(FilterIsNotNull::default().to_arrow()?),
-                datatype: FilterIsNotNull::arrow2_datatype(),
+                datatype: FilterIsNotNull::arrow_datatype(),
             },
         ),
         (
@@ -134,7 +134,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The target distance between two nodes.\n\nThis is helpful to scale the layout, for example if long labels are involved.",
                 custom_placeholder: Some(ForceDistance::default().to_arrow()?),
-                datatype: ForceDistance::arrow2_datatype(),
+                datatype: ForceDistance::arrow_datatype(),
             },
         ),
         (
@@ -142,7 +142,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Specifies how often this force should be applied per iteration.\n\nIncreasing this parameter can lead to better results at the cost of longer computation time.",
                 custom_placeholder: Some(ForceIterations::default().to_arrow()?),
-                datatype: ForceIterations::arrow2_datatype(),
+                datatype: ForceIterations::arrow_datatype(),
             },
         ),
         (
@@ -150,7 +150,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The strength of a given force.\n\nAllows to assign different weights to the individual forces, prioritizing one over the other.",
                 custom_placeholder: Some(ForceStrength::default().to_arrow()?),
-                datatype: ForceStrength::arrow2_datatype(),
+                datatype: ForceStrength::arrow_datatype(),
             },
         ),
         (
@@ -158,7 +158,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "How many columns a grid container should have.",
                 custom_placeholder: Some(GridColumns::default().to_arrow()?),
-                datatype: GridColumns::arrow2_datatype(),
+                datatype: GridColumns::arrow_datatype(),
             },
         ),
         (
@@ -166,7 +166,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Space between grid lines of one line to the next in scene units.",
                 custom_placeholder: Some(GridSpacing::default().to_arrow()?),
-                datatype: GridSpacing::arrow2_datatype(),
+                datatype: GridSpacing::arrow_datatype(),
             },
         ),
         (
@@ -174,7 +174,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "All the contents in the container.",
                 custom_placeholder: Some(IncludedContent::default().to_arrow()?),
-                datatype: IncludedContent::arrow2_datatype(),
+                datatype: IncludedContent::arrow_datatype(),
             },
         ),
         (
@@ -182,7 +182,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Interactive::arrow2_datatype(),
+                datatype: Interactive::arrow_datatype(),
             },
         ),
         (
@@ -190,7 +190,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: LockRangeDuringZoom::arrow2_datatype(),
+                datatype: LockRangeDuringZoom::arrow_datatype(),
             },
         ),
         (
@@ -198,7 +198,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Name of the map provider to be used in Map views.",
                 custom_placeholder: Some(MapProvider::default().to_arrow()?),
-                datatype: MapProvider::arrow2_datatype(),
+                datatype: MapProvider::arrow_datatype(),
             },
         ),
         (
@@ -206,7 +206,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Distance to the near clip plane used for `Spatial2DView`.",
                 custom_placeholder: Some(NearClipPlane::default().to_arrow()?),
-                datatype: NearClipPlane::arrow2_datatype(),
+                datatype: NearClipPlane::arrow_datatype(),
             },
         ),
         (
@@ -214,7 +214,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Tri-state for panel controls.",
                 custom_placeholder: Some(PanelState::default().to_arrow()?),
-                datatype: PanelState::arrow2_datatype(),
+                datatype: PanelState::arrow_datatype(),
             },
         ),
         (
@@ -222,7 +222,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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 archetypes.ViewContents.\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()?),
-                datatype: QueryExpression::arrow2_datatype(),
+                datatype: QueryExpression::arrow_datatype(),
             },
         ),
         (
@@ -230,7 +230,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The container that sits at the root of a viewport.",
                 custom_placeholder: Some(RootContainer::default().to_arrow()?),
-                datatype: RootContainer::arrow2_datatype(),
+                datatype: RootContainer::arrow_datatype(),
             },
         ),
         (
@@ -238,7 +238,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The layout share of a row in the container.",
                 custom_placeholder: Some(RowShare::default().to_arrow()?),
-                datatype: RowShare::arrow2_datatype(),
+                datatype: RowShare::arrow_datatype(),
             },
         ),
         (
@@ -246,7 +246,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Describe a component column to be selected in the dataframe view.",
                 custom_placeholder: Some(SelectedColumns::default().to_arrow()?),
-                datatype: SelectedColumns::arrow2_datatype(),
+                datatype: SelectedColumns::arrow_datatype(),
             },
         ),
         (
@@ -256,7 +256,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
                 custom_placeholder: Some(
                     TensorDimensionIndexSlider::default().to_arrow()?,
                 ),
-                datatype: TensorDimensionIndexSlider::arrow2_datatype(),
+                datatype: TensorDimensionIndexSlider::arrow_datatype(),
             },
         ),
         (
@@ -264,7 +264,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A timeline identified by its name.",
                 custom_placeholder: Some(TimelineName::default().to_arrow()?),
-                datatype: TimelineName::arrow2_datatype(),
+                datatype: TimelineName::arrow_datatype(),
             },
         ),
         (
@@ -272,7 +272,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The class identifier of view, e.g. `\"2D\"`, `\"TextLog\"`, ….",
                 custom_placeholder: Some(ViewClass::default().to_arrow()?),
-                datatype: ViewClass::arrow2_datatype(),
+                datatype: ViewClass::arrow_datatype(),
             },
         ),
         (
@@ -280,7 +280,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Determines whether an image or texture should be scaled to fit the viewport.",
                 custom_placeholder: Some(ViewFit::default().to_arrow()?),
-                datatype: ViewFit::arrow2_datatype(),
+                datatype: ViewFit::arrow_datatype(),
             },
         ),
         (
@@ -288,7 +288,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether a view is maximized.",
                 custom_placeholder: Some(ViewMaximized::default().to_arrow()?),
-                datatype: ViewMaximized::arrow2_datatype(),
+                datatype: ViewMaximized::arrow_datatype(),
             },
         ),
         (
@@ -296,7 +296,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The origin of a view.",
                 custom_placeholder: Some(ViewOrigin::default().to_arrow()?),
-                datatype: ViewOrigin::arrow2_datatype(),
+                datatype: ViewOrigin::arrow_datatype(),
             },
         ),
         (
@@ -306,7 +306,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
                 custom_placeholder: Some(
                     ViewerRecommendationHash::default().to_arrow()?,
                 ),
-                datatype: ViewerRecommendationHash::arrow2_datatype(),
+                datatype: ViewerRecommendationHash::arrow_datatype(),
             },
         ),
         (
@@ -314,7 +314,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether the container, view, entity or instance is currently visible.",
                 custom_placeholder: Some(Visible::default().to_arrow()?),
-                datatype: Visible::arrow2_datatype(),
+                datatype: Visible::arrow_datatype(),
             },
         ),
         (
@@ -322,7 +322,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: VisibleTimeRange::arrow2_datatype(),
+                datatype: VisibleTimeRange::arrow_datatype(),
             },
         ),
         (
@@ -330,7 +330,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Visual bounds in 2D space used for `Spatial2DView`.",
                 custom_placeholder: Some(VisualBounds2D::default().to_arrow()?),
-                datatype: VisualBounds2D::arrow2_datatype(),
+                datatype: VisualBounds2D::arrow_datatype(),
             },
         ),
         (
@@ -338,7 +338,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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: <https://github.com/rerun-io/rerun/issues/6626>\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()?),
-                datatype: VisualizerOverrides::arrow2_datatype(),
+                datatype: VisualizerOverrides::arrow_datatype(),
             },
         ),
         (
@@ -346,7 +346,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A zoom level determines how much of the world is visible on a map.",
                 custom_placeholder: Some(ZoomLevel::default().to_arrow()?),
-                datatype: ZoomLevel::arrow2_datatype(),
+                datatype: ZoomLevel::arrow_datatype(),
             },
         ),
         (
@@ -354,7 +354,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: AggregationPolicy::arrow2_datatype(),
+                datatype: AggregationPolicy::arrow_datatype(),
             },
         ),
         (
@@ -362,7 +362,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A color multiplier, usually applied to a whole entity, e.g. a mesh.",
                 custom_placeholder: Some(AlbedoFactor::default().to_arrow()?),
-                datatype: AlbedoFactor::arrow2_datatype(),
+                datatype: AlbedoFactor::arrow_datatype(),
             },
         ),
         (
@@ -370,7 +370,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: AnnotationContext::arrow2_datatype(),
+                datatype: AnnotationContext::arrow_datatype(),
             },
         ),
         (
@@ -378,7 +378,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The length of an axis in local units of the space.",
                 custom_placeholder: Some(AxisLength::default().to_arrow()?),
-                datatype: AxisLength::arrow2_datatype(),
+                datatype: AxisLength::arrow_datatype(),
             },
         ),
         (
@@ -386,7 +386,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A binary blob of data.",
                 custom_placeholder: None,
-                datatype: Blob::arrow2_datatype(),
+                datatype: Blob::arrow_datatype(),
             },
         ),
         (
@@ -394,7 +394,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A 16-bit ID representing a type of semantic class.",
                 custom_placeholder: Some(ClassId::default().to_arrow()?),
-                datatype: ClassId::arrow2_datatype(),
+                datatype: ClassId::arrow_datatype(),
             },
         ),
         (
@@ -402,7 +402,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Configures how a clear operation should behave - recursive or not.",
                 custom_placeholder: Some(ClearIsRecursive::default().to_arrow()?),
-                datatype: ClearIsRecursive::arrow2_datatype(),
+                datatype: ClearIsRecursive::arrow_datatype(),
             },
         ),
         (
@@ -410,7 +410,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Color::arrow2_datatype(),
+                datatype: Color::arrow_datatype(),
             },
         ),
         (
@@ -418,7 +418,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Colormap::arrow2_datatype(),
+                datatype: Colormap::arrow_datatype(),
             },
         ),
         (
@@ -426,7 +426,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: DepthMeter::arrow2_datatype(),
+                datatype: DepthMeter::arrow_datatype(),
             },
         ),
         (
@@ -434,7 +434,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: DrawOrder::arrow2_datatype(),
+                datatype: DrawOrder::arrow_datatype(),
             },
         ),
         (
@@ -442,7 +442,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: EntityPath::arrow2_datatype(),
+                datatype: EntityPath::arrow_datatype(),
             },
         ),
         (
@@ -450,7 +450,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "How a geometric shape is drawn and colored.",
                 custom_placeholder: Some(FillMode::default().to_arrow()?),
-                datatype: FillMode::arrow2_datatype(),
+                datatype: FillMode::arrow_datatype(),
             },
         ),
         (
@@ -458,7 +458,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: FillRatio::arrow2_datatype(),
+                datatype: FillRatio::arrow_datatype(),
             },
         ),
         (
@@ -466,7 +466,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: GammaCorrection::arrow2_datatype(),
+                datatype: GammaCorrection::arrow_datatype(),
             },
         ),
         (
@@ -474,7 +474,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: GeoLineString::arrow2_datatype(),
+                datatype: GeoLineString::arrow_datatype(),
             },
         ),
         (
@@ -482,7 +482,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "An edge in a graph connecting two nodes.",
                 custom_placeholder: Some(GraphEdge::default().to_arrow()?),
-                datatype: GraphEdge::arrow2_datatype(),
+                datatype: GraphEdge::arrow_datatype(),
             },
         ),
         (
@@ -490,7 +490,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A string-based ID representing a node in a graph.",
                 custom_placeholder: Some(GraphNode::default().to_arrow()?),
-                datatype: GraphNode::arrow2_datatype(),
+                datatype: GraphNode::arrow_datatype(),
             },
         ),
         (
@@ -498,7 +498,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Specifies if a graph has directed or undirected edges.",
                 custom_placeholder: Some(GraphType::default().to_arrow()?),
-                datatype: GraphType::arrow2_datatype(),
+                datatype: GraphType::arrow_datatype(),
             },
         ),
         (
@@ -506,7 +506,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: HalfSize2D::arrow2_datatype(),
+                datatype: HalfSize2D::arrow_datatype(),
             },
         ),
         (
@@ -514,7 +514,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: HalfSize3D::arrow2_datatype(),
+                datatype: HalfSize3D::arrow_datatype(),
             },
         ),
         (
@@ -522,7 +522,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A buffer that is known to store image data.\n\nTo interpret the contents of this buffer, see, [`components.ImageFormat`](https://rerun.io/docs/reference/types/components/image_format).",
                 custom_placeholder: None,
-                datatype: ImageBuffer::arrow2_datatype(),
+                datatype: ImageBuffer::arrow_datatype(),
             },
         ),
         (
@@ -530,7 +530,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: ImageFormat::arrow2_datatype(),
+                datatype: ImageFormat::arrow_datatype(),
             },
         ),
         (
@@ -538,7 +538,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: ImagePlaneDistance::arrow2_datatype(),
+                datatype: ImagePlaneDistance::arrow_datatype(),
             },
         ),
         (
@@ -546,7 +546,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A 16-bit ID representing a type of semantic keypoint within a class.",
                 custom_placeholder: Some(KeypointId::default().to_arrow()?),
-                datatype: KeypointId::arrow2_datatype(),
+                datatype: KeypointId::arrow_datatype(),
             },
         ),
         (
@@ -554,7 +554,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: LatLon::arrow2_datatype(),
+                datatype: LatLon::arrow_datatype(),
             },
         ),
         (
@@ -562,7 +562,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Length::arrow2_datatype(),
+                datatype: Length::arrow_datatype(),
             },
         ),
         (
@@ -570,7 +570,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: LineStrip2D::arrow2_datatype(),
+                datatype: LineStrip2D::arrow_datatype(),
             },
         ),
         (
@@ -578,7 +578,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: LineStrip3D::arrow2_datatype(),
+                datatype: LineStrip3D::arrow_datatype(),
             },
         ),
         (
@@ -586,7 +586,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: MagnificationFilter::arrow2_datatype(),
+                datatype: MagnificationFilter::arrow_datatype(),
             },
         ),
         (
@@ -594,7 +594,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The visual appearance of a point in e.g. a 2D plot.",
                 custom_placeholder: Some(MarkerShape::default().to_arrow()?),
-                datatype: MarkerShape::arrow2_datatype(),
+                datatype: MarkerShape::arrow_datatype(),
             },
         ),
         (
@@ -602,7 +602,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: MarkerSize::arrow2_datatype(),
+                datatype: MarkerSize::arrow_datatype(),
             },
         ),
         (
@@ -610,7 +610,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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 <https://www.iana.org/assignments/media-types/media-types.xhtml>.",
                 custom_placeholder: Some(MediaType::default().to_arrow()?),
-                datatype: MediaType::arrow2_datatype(),
+                datatype: MediaType::arrow_datatype(),
             },
         ),
         (
@@ -618,7 +618,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A display name, typically for an entity or a item like a plot series.",
                 custom_placeholder: Some(Name::default().to_arrow()?),
-                datatype: Name::arrow2_datatype(),
+                datatype: Name::arrow_datatype(),
             },
         ),
         (
@@ -626,7 +626,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Opacity::arrow2_datatype(),
+                datatype: Opacity::arrow_datatype(),
             },
         ),
         (
@@ -634,7 +634,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: PinholeProjection::arrow2_datatype(),
+                datatype: PinholeProjection::arrow_datatype(),
             },
         ),
         (
@@ -642,7 +642,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "An infinite 3D plane represented by a unit normal vector and a distance.\n\nAny point P on the plane fulfills the equation `dot(xyz, P) - d = 0`,\nwhere `xyz` is the plane's normal and `d` the distance of the plane from the origin.\nThis representation is also known as the Hesse normal form.\n\nNote: although the normal will be passed through to the\ndatastore as provided, when used in the Viewer, planes will always be normalized.\nI.e. the plane with xyz = (2, 0, 0), d = 1 is equivalent to xyz = (1, 0, 0), d = 0.5",
                 custom_placeholder: None,
-                datatype: Plane3D::arrow2_datatype(),
+                datatype: Plane3D::arrow_datatype(),
             },
         ),
         (
@@ -650,7 +650,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "3D rotation represented by a rotation around a given axis that doesn't propagate in the transform hierarchy.\n\nIf normalization of the rotation axis fails the rotation is treated as an invalid transform.",
                 custom_placeholder: Some(PoseRotationAxisAngle::default().to_arrow()?),
-                datatype: PoseRotationAxisAngle::arrow2_datatype(),
+                datatype: PoseRotationAxisAngle::arrow_datatype(),
             },
         ),
         (
@@ -658,7 +658,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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.\nIf normalization fails the rotation is treated as an invalid transform.",
                 custom_placeholder: Some(PoseRotationQuat::default().to_arrow()?),
-                datatype: PoseRotationQuat::arrow2_datatype(),
+                datatype: PoseRotationQuat::arrow_datatype(),
             },
         ),
         (
@@ -666,7 +666,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: PoseScale3D::arrow2_datatype(),
+                datatype: PoseScale3D::arrow_datatype(),
             },
         ),
         (
@@ -674,7 +674,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: PoseTransformMat3x3::arrow2_datatype(),
+                datatype: PoseTransformMat3x3::arrow_datatype(),
             },
         ),
         (
@@ -682,7 +682,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A translation vector in 3D space that doesn't propagate in the transform hierarchy.",
                 custom_placeholder: Some(PoseTranslation3D::default().to_arrow()?),
-                datatype: PoseTranslation3D::arrow2_datatype(),
+                datatype: PoseTranslation3D::arrow_datatype(),
             },
         ),
         (
@@ -690,7 +690,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A position in 2D space.",
                 custom_placeholder: Some(Position2D::default().to_arrow()?),
-                datatype: Position2D::arrow2_datatype(),
+                datatype: Position2D::arrow_datatype(),
             },
         ),
         (
@@ -698,7 +698,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A position in 3D space.",
                 custom_placeholder: Some(Position3D::default().to_arrow()?),
-                datatype: Position3D::arrow2_datatype(),
+                datatype: Position3D::arrow_datatype(),
             },
         ),
         (
@@ -706,7 +706,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Radius::arrow2_datatype(),
+                datatype: Radius::arrow_datatype(),
             },
         ),
         (
@@ -714,7 +714,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A 1D range, specifying a lower and upper bound.",
                 custom_placeholder: Some(Range1D::default().to_arrow()?),
-                datatype: Range1D::arrow2_datatype(),
+                datatype: Range1D::arrow_datatype(),
             },
         ),
         (
@@ -722,7 +722,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A recording URI (Uniform Resource Identifier).",
                 custom_placeholder: None,
-                datatype: RecordingUri::arrow2_datatype(),
+                datatype: RecordingUri::arrow_datatype(),
             },
         ),
         (
@@ -730,7 +730,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Resolution::arrow2_datatype(),
+                datatype: Resolution::arrow_datatype(),
             },
         ),
         (
@@ -738,7 +738,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "3D rotation represented by a rotation around a given axis.\n\nIf normalization of the rotation axis fails the rotation is treated as an invalid transform.",
                 custom_placeholder: Some(RotationAxisAngle::default().to_arrow()?),
-                datatype: RotationAxisAngle::arrow2_datatype(),
+                datatype: RotationAxisAngle::arrow_datatype(),
             },
         ),
         (
@@ -746,7 +746,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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.\nIf normalization fails the rotation is treated as an invalid transform.",
                 custom_placeholder: Some(RotationQuat::default().to_arrow()?),
-                datatype: RotationQuat::arrow2_datatype(),
+                datatype: RotationQuat::arrow_datatype(),
             },
         ),
         (
@@ -754,7 +754,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Scalar::arrow2_datatype(),
+                datatype: Scalar::arrow_datatype(),
             },
         ),
         (
@@ -762,7 +762,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Scale3D::arrow2_datatype(),
+                datatype: Scale3D::arrow_datatype(),
             },
         ),
         (
@@ -770,7 +770,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Whether the entity's [`components.Text`](https://rerun.io/docs/reference/types/components/text) label is shown.\n\nThe main purpose of this component existing separately from the labels themselves\nis to be overridden when desired, to allow hiding and showing from the viewer and\nblueprints.",
                 custom_placeholder: None,
-                datatype: ShowLabels::arrow2_datatype(),
+                datatype: ShowLabels::arrow_datatype(),
             },
         ),
         (
@@ -778,7 +778,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The width of a stroke specified in UI points.",
                 custom_placeholder: Some(StrokeWidth::default().to_arrow()?),
-                datatype: StrokeWidth::arrow2_datatype(),
+                datatype: StrokeWidth::arrow_datatype(),
             },
         ),
         (
@@ -786,7 +786,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: TensorData::arrow2_datatype(),
+                datatype: TensorData::arrow_datatype(),
             },
         ),
         (
@@ -796,7 +796,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
                 custom_placeholder: Some(
                     TensorDimensionIndexSelection::default().to_arrow()?,
                 ),
-                datatype: TensorDimensionIndexSelection::arrow2_datatype(),
+                datatype: TensorDimensionIndexSelection::arrow_datatype(),
             },
         ),
         (
@@ -804,7 +804,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Specifies which dimension to use for height.",
                 custom_placeholder: Some(TensorHeightDimension::default().to_arrow()?),
-                datatype: TensorHeightDimension::arrow2_datatype(),
+                datatype: TensorHeightDimension::arrow_datatype(),
             },
         ),
         (
@@ -812,7 +812,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Specifies which dimension to use for width.",
                 custom_placeholder: Some(TensorWidthDimension::default().to_arrow()?),
-                datatype: TensorWidthDimension::arrow2_datatype(),
+                datatype: TensorWidthDimension::arrow_datatype(),
             },
         ),
         (
@@ -820,7 +820,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: Texcoord2D::arrow2_datatype(),
+                datatype: Texcoord2D::arrow_datatype(),
             },
         ),
         (
@@ -828,7 +828,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A string of text, e.g. for labels and text documents.",
                 custom_placeholder: Some(Text::default().to_arrow()?),
-                datatype: Text::arrow2_datatype(),
+                datatype: Text::arrow_datatype(),
             },
         ),
         (
@@ -836,7 +836,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: TextLogLevel::arrow2_datatype(),
+                datatype: TextLogLevel::arrow_datatype(),
             },
         ),
         (
@@ -844,7 +844,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: TransformMat3x3::arrow2_datatype(),
+                datatype: TransformMat3x3::arrow_datatype(),
             },
         ),
         (
@@ -852,7 +852,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Specifies relation a spatial transform describes.",
                 custom_placeholder: Some(TransformRelation::default().to_arrow()?),
-                datatype: TransformRelation::arrow2_datatype(),
+                datatype: TransformRelation::arrow_datatype(),
             },
         ),
         (
@@ -860,7 +860,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A translation vector in 3D space.",
                 custom_placeholder: Some(Translation3D::default().to_arrow()?),
-                datatype: Translation3D::arrow2_datatype(),
+                datatype: Translation3D::arrow_datatype(),
             },
         ),
         (
@@ -868,7 +868,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "The three indices of a triangle in a triangle mesh.",
                 custom_placeholder: Some(TriangleIndices::default().to_arrow()?),
-                datatype: TriangleIndices::arrow2_datatype(),
+                datatype: TriangleIndices::arrow_datatype(),
             },
         ),
         (
@@ -876,7 +876,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Range of expected or valid values, specifying a lower and upper bound.",
                 custom_placeholder: Some(ValueRange::default().to_arrow()?),
-                datatype: ValueRange::arrow2_datatype(),
+                datatype: ValueRange::arrow_datatype(),
             },
         ),
         (
@@ -884,7 +884,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A vector in 2D space.",
                 custom_placeholder: Some(Vector2D::default().to_arrow()?),
-                datatype: Vector2D::arrow2_datatype(),
+                datatype: Vector2D::arrow_datatype(),
             },
         ),
         (
@@ -892,7 +892,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "A vector in 3D space.",
                 custom_placeholder: Some(Vector3D::default().to_arrow()?),
-                datatype: Vector3D::arrow2_datatype(),
+                datatype: Vector3D::arrow_datatype(),
             },
         ),
         (
@@ -900,7 +900,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             ComponentReflection {
                 docstring_md: "Timestamp inside a [`archetypes.AssetVideo`](https://rerun.io/docs/reference/types/archetypes/asset_video).",
                 custom_placeholder: Some(VideoTimestamp::default().to_arrow()?),
-                datatype: VideoTimestamp::arrow2_datatype(),
+                datatype: VideoTimestamp::arrow_datatype(),
             },
         ),
         (
@@ -908,7 +908,7 @@ fn generate_component_reflection() -> Result<ComponentReflectionMap, Serializati
             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()?),
-                datatype: ViewCoordinates::arrow2_datatype(),
+                datatype: ViewCoordinates::arrow_datatype(),
             },
         ),
     ];
diff --git a/crates/store/re_types_core/src/reflection.rs b/crates/store/re_types_core/src/reflection.rs
index 7ff274c54a3a..1f1395e9c564 100644
--- a/crates/store/re_types_core/src/reflection.rs
+++ b/crates/store/re_types_core/src/reflection.rs
@@ -65,6 +65,12 @@ impl Reflection {
 ///
 /// See also [`ComponentReflection::custom_placeholder`].
 pub fn generic_placeholder_for_datatype(
+    datatype: &arrow::datatypes::DataType,
+) -> arrow::array::ArrayRef {
+    generic_placeholder_for_datatype_arrow2(&datatype.clone().into()).into()
+}
+
+fn generic_placeholder_for_datatype_arrow2(
     datatype: &arrow2::datatypes::DataType,
 ) -> Box<dyn arrow2::array::Array> {
     use arrow2::{
@@ -121,7 +127,7 @@ pub fn generic_placeholder_for_datatype(
         DataType::Utf8 => Box::new(array::Utf8Array::<i32>::from_slice([""])),
         DataType::LargeUtf8 => Box::new(array::Utf8Array::<i64>::from_slice([""])),
         DataType::List(field) => {
-            let inner = generic_placeholder_for_datatype(field.data_type());
+            let inner = generic_placeholder_for_datatype_arrow2(field.data_type());
             let offsets = arrow2::offset::Offsets::try_from_lengths(std::iter::once(inner.len()))
                 .expect("failed to create offsets buffer");
             Box::new(array::ListArray::<i32>::new(
@@ -140,7 +146,7 @@ pub fn generic_placeholder_for_datatype(
         }
 
         DataType::LargeList(field) => {
-            let inner = generic_placeholder_for_datatype(field.data_type());
+            let inner = generic_placeholder_for_datatype_arrow2(field.data_type());
             let offsets = arrow2::offset::Offsets::try_from_lengths(std::iter::once(inner.len()))
                 .expect("failed to create offsets buffer");
             Box::new(array::ListArray::<i64>::new(
@@ -153,7 +159,7 @@ pub fn generic_placeholder_for_datatype(
         DataType::Struct(fields) => {
             let inners = fields
                 .iter()
-                .map(|field| generic_placeholder_for_datatype(field.data_type()));
+                .map(|field| generic_placeholder_for_datatype_arrow2(field.data_type()));
             Box::new(array::StructArray::new(
                 datatype.clone(),
                 inners.collect(),
@@ -162,7 +168,7 @@ pub fn generic_placeholder_for_datatype(
         }
         DataType::Union(fields, _types, _union_mode) => {
             if let Some(first_field) = fields.first() {
-                let first_field = generic_placeholder_for_datatype(first_field.data_type());
+                let first_field = generic_placeholder_for_datatype_arrow2(first_field.data_type());
                 let first_field_len = first_field.len(); // Should be 1, but let's play this safe!
                 let other_fields = fields
                     .iter()
@@ -199,7 +205,7 @@ pub fn generic_placeholder_for_datatype(
             )]))
         }
 
-        DataType::Extension(_, datatype, _) => generic_placeholder_for_datatype(datatype),
+        DataType::Extension(_, datatype, _) => generic_placeholder_for_datatype_arrow2(datatype),
     }
 }
 
@@ -223,7 +229,7 @@ pub struct ComponentReflection {
     pub custom_placeholder: Option<ArrayRef>,
 
     /// Datatype of the component.
-    pub datatype: arrow2::datatypes::DataType,
+    pub datatype: arrow::datatypes::DataType,
 }
 
 /// Runtime reflection about archetypes.
diff --git a/crates/viewer/re_viewer_context/src/viewer_context.rs b/crates/viewer/re_viewer_context/src/viewer_context.rs
index 10e2c7625027..52ea2b6988a6 100644
--- a/crates/viewer/re_viewer_context/src/viewer_context.rs
+++ b/crates/viewer/re_viewer_context/src/viewer_context.rs
@@ -238,18 +238,17 @@ impl ViewerContext<'_> {
         } else {
             self.recording_engine()
                 .store()
-                .lookup_datatype_arrow2(&component)
-                .cloned()
-                .or_else(|| self.blueprint_engine().store().lookup_datatype_arrow2(&component).cloned())
+                .lookup_datatype(&component)
+                .or_else(|| self.blueprint_engine().store().lookup_datatype(&component))
                 .unwrap_or_else(|| {
                     re_log::error_once!("Could not find datatype for component {component}. Using null array as placeholder.");
-                    re_chunk::external::arrow2::datatypes::DataType::Null
+                    arrow::datatypes::DataType::Null
                 })
         };
 
         // TODO(andreas): Is this operation common enough to cache the result? If so, here or in the reflection data?
         // The nice thing about this would be that we could always give out references (but updating said cache wouldn't be easy in that case).
-        re_types::reflection::generic_placeholder_for_datatype(&datatype).into()
+        re_types::reflection::generic_placeholder_for_datatype(&datatype)
     }
 }