Skip to content

Commit 346f250

Browse files
committed
Address remaining TODO(#8129)s
1 parent 38c1a8c commit 346f250

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

crates/store/re_sorbet/src/migrations/v0_0_2__to__v0_1_0.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ fn rewire_tagged_components(batch: &RecordBatch) -> RecordBatch {
7272

7373
if field.name().ends_with("Indicator") {
7474
let field_name = field.name();
75-
// TODO(#8129): Remove indicator components
7675
re_log::debug_once!(
7776
"Moving indicator from field to component metadata field: {field_name}"
7877
);
@@ -112,7 +111,6 @@ fn rewire_tagged_components(batch: &RecordBatch) -> RecordBatch {
112111
}
113112
(None, Some(archetype_field)) => (None, archetype_field, Some(component)),
114113
(maybe_archetype, None) if component.ends_with("Indicator") => {
115-
// TODO(#8129): For now, this renames the indicator column metadata. Eventually, we want to remove the column altogether.
116114
re_log::debug_once!(
117115
"Moving indicator to component field: {component}"
118116
);

crates/viewer/re_redap_browser/src/servers.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,18 @@ impl Server {
222222
entity_path.starts_with(&std::iter::once(EntityPathPart::properties()).collect())
223223
}) {
224224
// Property column, just hide indicator components
225-
//TODO(#8129): remove this when we no longer have indicator components
226-
!desc
225+
// TODO(grtlr): Indicators are gone, but since servers might still
226+
// have this column we keep this check for now.
227+
let is_indicator = desc
227228
.column_name(BatchType::Dataframe)
228-
.ends_with("Indicator")
229+
.ends_with("Indicator");
230+
if is_indicator {
231+
re_log::warn_once!(
232+
"Encountered unexpected indicator column name: {}",
233+
desc.column_name(BatchType::Dataframe)
234+
)
235+
}
236+
!is_indicator
229237
} else {
230238
matches!(
231239
desc.display_name().as_str(),

crates/viewer/re_viewer_context/src/view/visualizer_system.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ use crate::{
1414
#[derive(Debug, Clone, Default)]
1515
pub struct SortedComponentDescriptorSet(linked_hash_map::LinkedHashMap<ComponentDescriptor, ()>);
1616

17+
pub type UnorderedArchetypeSet = IntSet<ArchetypeName>;
18+
1719
impl SortedComponentDescriptorSet {
1820
pub fn insert(&mut self, k: ComponentDescriptor) -> Option<()> {
1921
self.0.insert(k, ())
@@ -41,8 +43,7 @@ impl FromIterator<ComponentDescriptor> for SortedComponentDescriptorSet {
4143
pub struct VisualizerQueryInfo {
4244
/// These are not required, but if _any_ of these are found, it is a strong indication that this
4345
/// system should be active (if also the `required_components` are found).
44-
// TODO(#8129): Consider making this a proper struct to make the semantics of `Default::default()` clearer.
45-
pub relevant_archetypes: IntSet<ArchetypeName>,
46+
pub relevant_archetypes: UnorderedArchetypeSet,
4647

4748
/// Returns the minimal set of components that the system _requires_ in order to be instantiated.
4849
///

0 commit comments

Comments
 (0)