Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenable tagging post-0.21 release #8500

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Reenable tagging post-0.21 release #8500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c48f283
reenable tagging
teh-cmc Dec 17, 2024
54dfa2d
py tests too
teh-cmc Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions crates/store/re_chunk/src/chunk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ impl ChunkComponents {
component_desc: ComponentDescriptor,
list_array: Arrow2ListArray<i32>,
) -> Option<Arrow2ListArray<i32>> {
// TODO(cmc): revert me
let component_desc = component_desc.untagged();
self.0
.entry(component_desc.component_name)
.or_default()
Expand Down
26 changes: 4 additions & 22 deletions docs/snippets/all/descriptors/descr_builtin_archetype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
];
Expand Down
30 changes: 6 additions & 24 deletions docs/snippets/all/descriptors/descr_custom_archetype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
];
Expand Down
12 changes: 2 additions & 10 deletions docs/snippets/all/descriptors/descr_custom_component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,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(),
}, //
];
Expand Down
33 changes: 7 additions & 26 deletions rerun_py/tests/unit/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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()
Expand Down
Loading