Reenable tagging (#8500)

teh-cmc · web-flow · commit 8ca16b1666d9 · 2025-01-21T09:57:57.000+01:00
Title.

* DNM: requires 0.21 released first
diff --git a/crates/store/re_chunk/src/chunk.rs b/crates/store/re_chunk/src/chunk.rs
@@ -68,8 +68,6 @@ impl ChunkComponents {
         component_desc: ComponentDescriptor,
         list_array: ArrowListArray,
     ) -> Option<ArrowListArray> {
-        // TODO(cmc): revert me
-        let component_desc = component_desc.untagged();
         self.0
             .entry(component_desc.component_name)
             .or_default()
@@ -391,32 +389,6 @@ impl Chunk {
         self
     }
 
-    /// Clones the chunk into a new chunk where all descriptors are untagged.
-    ///
-    /// Only useful as a migration tool while the Rerun ecosystem slowly moves over
-    /// to always using tags for everything.
-    #[doc(hidden)]
-    #[inline]
-    pub fn clone_as_untagged(&self) -> Self {
-        let mut chunk = self.clone();
-
-        let per_component_name = &mut chunk.components;
-        for (component_name, per_desc) in per_component_name.iter_mut() {
-            if per_desc.len() != 1 {
-                // If there are more than one entry, then we're in the land of UB anyway (for now).
-                continue;
-            }
-
-            let untagged_descriptor = ComponentDescriptor::new(*component_name);
-            *per_desc = std::mem::take(per_desc)
-                .into_values()
-                .map(|list_array| (untagged_descriptor.clone(), list_array))
-                .collect();
-        }
-
-        chunk
-    }
-
     /// Clones the chunk into a new chunk where all [`RowId`]s are [`RowId::ZERO`].
     pub fn zeroed(self) -> Self {
         let row_ids = std::iter::repeat(RowId::ZERO)
diff --git a/crates/store/re_chunk_store/src/writes.rs b/crates/store/re_chunk_store/src/writes.rs
@@ -63,7 +63,6 @@ impl ChunkStore {
         // * Etc.
         if self.id.kind == re_log_types::StoreKind::Blueprint {
             let patched = chunk.patched_for_blueprint_021_compat();
-            let patched = patched.clone_as_untagged();
             chunk = Arc::new(patched);
         }
 
diff --git a/crates/store/re_types_core/src/component_descriptor.rs b/crates/store/re_types_core/src/component_descriptor.rs
@@ -142,10 +142,6 @@ impl ComponentDescriptor {
         }
     }
 
-    pub fn untagged(self) -> Self {
-        Self::new(self.component_name)
-    }
-
     /// Unconditionally sets [`Self::archetype_name`] to the given one.
     #[inline]
     pub fn with_archetype_name(mut self, archetype_name: ArchetypeName) -> Self {
diff --git a/docs/snippets/all/descriptors/descr_builtin_archetype.rs b/docs/snippets/all/descriptors/descr_builtin_archetype.rs
@@ -56,38 +56,20 @@ fn check_tags(rec: &rerun::RecordingStream) {
             .collect::<Vec<_>>();
         descriptors.sort();
 
-        // TODO(cmc): revert me
-        // let expected = vec![
-        //     ComponentDescriptor {
-        //         archetype_name: None,
-        //         archetype_field_name: None,
-        //         component_name: "rerun.components.Points3DIndicator".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("rerun.archetypes.Points3D".into()),
-        //         archetype_field_name: Some("positions".into()),
-        //         component_name: "rerun.components.Position3D".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("rerun.archetypes.Points3D".into()),
-        //         archetype_field_name: Some("radii".into()),
-        //         component_name: "rerun.components.Radius".into(),
-        //     },
-        // ];
         let expected = vec![
             ComponentDescriptor {
                 archetype_name: None,
                 archetype_field_name: None,
                 component_name: "rerun.components.Points3DIndicator".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("rerun.archetypes.Points3D".into()),
+                archetype_field_name: Some("positions".into()),
                 component_name: "rerun.components.Position3D".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("rerun.archetypes.Points3D".into()),
+                archetype_field_name: Some("radii".into()),
                 component_name: "rerun.components.Radius".into(),
             },
         ];
diff --git a/docs/snippets/all/descriptors/descr_custom_archetype.rs b/docs/snippets/all/descriptors/descr_custom_archetype.rs
@@ -104,38 +104,20 @@ fn check_tags(rec: &rerun::RecordingStream) {
             .collect::<Vec<_>>();
         descriptors.sort();
 
-        // TODO(cmc): revert me
-        // let expected = vec![
-        //     ComponentDescriptor {
-        //         archetype_name: None,
-        //         archetype_field_name: None,
-        //         component_name: "user.CustomPoints3DIndicator".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("user.CustomPoints3D".into()),
-        //         archetype_field_name: Some("colors".into()),
-        //         component_name: "rerun.components.Color".into(),
-        //     },
-        //     ComponentDescriptor {
-        //         archetype_name: Some("user.CustomPoints3D".into()),
-        //         archetype_field_name: Some("custom_positions".into()),
-        //         component_name: "user.CustomPosition3D".into(),
-        //     },
-        // ];
         let expected = vec![
             ComponentDescriptor {
                 archetype_name: None,
                 archetype_field_name: None,
-                component_name: "rerun.components.Color".into(),
+                component_name: "user.CustomPoints3DIndicator".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
-                component_name: "user.CustomPoints3DIndicator".into(),
+                archetype_name: Some("user.CustomPoints3D".into()),
+                archetype_field_name: Some("colors".into()),
+                component_name: "rerun.components.Color".into(),
             },
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("user.CustomPoints3D".into()),
+                archetype_field_name: Some("custom_positions".into()),
                 component_name: "user.CustomPosition3D".into(),
             },
         ];
diff --git a/docs/snippets/all/descriptors/descr_custom_component.rs b/docs/snippets/all/descriptors/descr_custom_component.rs
@@ -60,18 +60,10 @@ fn check_tags(rec: &rerun::RecordingStream) {
             .collect::<Vec<_>>();
         descriptors.sort();
 
-        // TODO(cmc): revert me
-        // let expected = vec![
-        //     ComponentDescriptor {
-        //         archetype_name: Some("user.CustomArchetype".into()),
-        //         archetype_field_name: Some("custom_positions".into()),
-        //         component_name: "user.CustomPosition3D".into(),
-        //     }, //
-        // ];
         let expected = vec![
             ComponentDescriptor {
-                archetype_name: None,
-                archetype_field_name: None,
+                archetype_name: Some("user.CustomArchetype".into()),
+                archetype_field_name: Some("custom_positions".into()),
                 component_name: "user.CustomPosition3D".into(),
             }, //
         ];
diff --git a/docs/snippets/snippets.toml b/docs/snippets/snippets.toml
@@ -231,6 +231,9 @@ quick_start = [ # These examples don't have exactly the same implementation.
   "py",
   "rust",
 ]
+"archetypes/points3d_partial_updates" = [ # TODO(cmc): revert once C++ has tagged partial updates
+  "cpp",
+]
 "archetypes/points3d_random" = [ # TODO(#3206): examples use different RNGs
   "cpp",
   "py",
diff --git a/rerun_py/tests/unit/test_dataframe.py b/rerun_py/tests/unit/test_dataframe.py
@@ -104,36 +104,14 @@ def test_schema_recording(self) -> None:
         # Color, Points3DIndicator, Position3D, Radius, Text, TextIndicator
         assert len(schema.component_columns()) == 6
 
-        # TODO(cmc): revert me
-        # assert schema.index_columns()[0].name == "log_tick"
-        # assert schema.index_columns()[1].name == "log_time"
-        # assert schema.index_columns()[2].name == "my_index"
-        # assert schema.component_columns()[0].entity_path == "/points"
-        # assert schema.component_columns()[0].component_name == "rerun.components.Points3DIndicator"
-        # assert schema.component_columns()[0].is_static is False
-        # assert schema.component_columns()[1].entity_path == "/points"
-        # assert schema.component_columns()[1].component_name == "rerun.components.Color"
-        # assert schema.component_columns()[1].is_static is False
-        # assert schema.component_columns()[2].entity_path == "/points"
-        # assert schema.component_columns()[2].component_name == "rerun.components.Position3D"
-        # assert schema.component_columns()[2].is_static is False
-        # assert schema.component_columns()[3].entity_path == "/points"
-        # assert schema.component_columns()[3].component_name == "rerun.components.Radius"
-        # assert schema.component_columns()[3].is_static is False
-        # assert schema.component_columns()[4].entity_path == "/static_text"
-        # assert schema.component_columns()[4].component_name == "rerun.components.TextLogIndicator"
-        # assert schema.component_columns()[4].is_static is True
-        # assert schema.component_columns()[5].entity_path == "/static_text"
-        # assert schema.component_columns()[5].component_name == "rerun.components.Text"
-        # assert schema.component_columns()[5].is_static is True
         assert schema.index_columns()[0].name == "log_tick"
         assert schema.index_columns()[1].name == "log_time"
         assert schema.index_columns()[2].name == "my_index"
         assert schema.component_columns()[0].entity_path == "/points"
-        assert schema.component_columns()[0].component_name == "rerun.components.Color"
+        assert schema.component_columns()[0].component_name == "rerun.components.Points3DIndicator"
         assert schema.component_columns()[0].is_static is False
         assert schema.component_columns()[1].entity_path == "/points"
-        assert schema.component_columns()[1].component_name == "rerun.components.Points3DIndicator"
+        assert schema.component_columns()[1].component_name == "rerun.components.Color"
         assert schema.component_columns()[1].is_static is False
         assert schema.component_columns()[2].entity_path == "/points"
         assert schema.component_columns()[2].component_name == "rerun.components.Position3D"
@@ -142,11 +120,14 @@ def test_schema_recording(self) -> None:
         assert schema.component_columns()[3].component_name == "rerun.components.Radius"
         assert schema.component_columns()[3].is_static is False
         assert schema.component_columns()[4].entity_path == "/static_text"
-        assert schema.component_columns()[4].component_name == "rerun.components.Text"
+        assert schema.component_columns()[4].component_name == "rerun.components.TextLogIndicator"
         assert schema.component_columns()[4].is_static is True
         assert schema.component_columns()[5].entity_path == "/static_text"
-        assert schema.component_columns()[5].component_name == "rerun.components.TextLogIndicator"
+        assert schema.component_columns()[5].component_name == "rerun.components.Text"
         assert schema.component_columns()[5].is_static is True
+        assert schema.index_columns()[0].name == "log_tick"
+        assert schema.index_columns()[1].name == "log_time"
+        assert schema.index_columns()[2].name == "my_index"
 
     def test_schema_view(self) -> None:
         schema = self.recording.view(index="my_index", contents="points").schema()

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ impl ChunkStore {`
`63`	`63`	`// * Etc.`
`64`	`64`	`if self.id.kind == re_log_types::StoreKind::Blueprint {`
`65`	`65`	`let patched = chunk.patched_for_blueprint_021_compat();`
`66`		`- let patched = patched.clone_as_untagged();`
`67`	`66`	`chunk = Arc::new(patched);`
`68`	`67`	`}`
`69`	`68`
Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,6 @@ impl ComponentDescriptor {`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`- pub fn untagged(self) -> Self {`
`146`		`- Self::new(self.component_name)`
`147`		`- }`
`148`		`-`
`149`	`145`	/// Unconditionally sets [`Self::archetype_name`] to the given one.
`150`	`146`	`#[inline]`
`151`	`147`	`pub fn with_archetype_name(mut self, archetype_name: ArchetypeName) -> Self {`