From 75e6b84440f63fbd64d348e5cfd438fa76308e16 Mon Sep 17 00:00:00 2001 From: Clement Rey Date: Thu, 20 Jul 2023 17:06:37 +0200 Subject: [PATCH] migrate all arrow store internal testing to new Point2D --- crates/re_arrow_store/benches/arrow2.rs | 11 +- .../examples/latest_component.rs | 6 +- .../examples/latest_components.rs | 4 +- .../examples/range_components.rs | 10 +- crates/re_arrow_store/tests/correctness.rs | 14 +- crates/re_arrow_store/tests/data_store.rs | 140 +++++++++--------- 6 files changed, 93 insertions(+), 92 deletions(-) diff --git a/crates/re_arrow_store/benches/arrow2.rs b/crates/re_arrow_store/benches/arrow2.rs index 1b34e78f17696..63686651e8879 100644 --- a/crates/re_arrow_store/benches/arrow2.rs +++ b/crates/re_arrow_store/benches/arrow2.rs @@ -10,7 +10,7 @@ use criterion::{criterion_group, Criterion}; use itertools::Itertools; use re_components::{ datagen::{build_some_instances, build_some_point2d, build_some_rects}, - LegacyPoint2D, Rect2D, + Point2D, Rect2D, }; use re_log_types::{DataCell, SizeBytes as _}; use re_types::{components::InstanceKey, Component}; @@ -295,9 +295,14 @@ fn estimated_size_bytes(c: &mut Criterion) { } { - fn generate_points() -> Vec> { + fn generate_points() -> Vec> { (0..NUM_ROWS) - .map(|_| build_some_point2d(NUM_INSTANCES)) + .map(|_| { + build_some_point2d(NUM_INSTANCES) + .into_iter() + .map(|p| Point2D::new(p.x, p.y)) + .collect_vec() + }) .collect() } diff --git a/crates/re_arrow_store/examples/latest_component.rs b/crates/re_arrow_store/examples/latest_component.rs index eb97a3f306873..4c859e4966c4b 100644 --- a/crates/re_arrow_store/examples/latest_component.rs +++ b/crates/re_arrow_store/examples/latest_component.rs @@ -8,7 +8,7 @@ use re_arrow_store::polars_util::latest_component; use re_arrow_store::{test_row, DataStore, LatestAtQuery, TimeType, Timeline}; use re_components::{ datagen::{build_frame_nr, build_some_point2d, build_some_rects}, - LegacyPoint2D, Rect2D, + Point2D, Rect2D, }; use re_log_types::EntityPath; use re_types::{components::InstanceKey, Loggable}; @@ -45,8 +45,8 @@ fn main() { &store, &LatestAtQuery::new(timeline_frame_nr, 10.into()), &ent_path, - LegacyPoint2D::name(), + Point2D::name(), ) .unwrap(); - println!("Query results from {:?}'s PoV:\n{df}", LegacyPoint2D::name()); + println!("Query results from {:?}'s PoV:\n{df}", Point2D::name()); } diff --git a/crates/re_arrow_store/examples/latest_components.rs b/crates/re_arrow_store/examples/latest_components.rs index d6f1dc6496346..b1023d548816a 100644 --- a/crates/re_arrow_store/examples/latest_components.rs +++ b/crates/re_arrow_store/examples/latest_components.rs @@ -10,7 +10,7 @@ use re_arrow_store::polars_util::latest_components; use re_arrow_store::{test_row, DataStore, LatestAtQuery, TimeType, Timeline}; use re_components::{ datagen::{build_frame_nr, build_some_point2d, build_some_rects}, - LegacyPoint2D, Rect2D, + Point2D, Rect2D, }; use re_log_types::EntityPath; use re_types::{components::InstanceKey, Loggable}; @@ -31,7 +31,7 @@ fn main() { &store, &LatestAtQuery::new(timeline_frame_nr, 10.into()), &ent_path, - &[LegacyPoint2D::name(), Rect2D::name()], + &[Point2D::name(), Rect2D::name()], &JoinType::Outer, ) .unwrap(); diff --git a/crates/re_arrow_store/examples/range_components.rs b/crates/re_arrow_store/examples/range_components.rs index a598b584a3f92..14e71b0398cc7 100644 --- a/crates/re_arrow_store/examples/range_components.rs +++ b/crates/re_arrow_store/examples/range_components.rs @@ -8,7 +8,7 @@ use polars_core::prelude::JoinType; use re_arrow_store::{polars_util, test_row, DataStore, RangeQuery, TimeRange}; use re_components::{ datagen::{build_frame_nr, build_some_point2d, build_some_rects}, - LegacyPoint2D, Rect2D, + Point2D, Rect2D, }; use re_log_types::{EntityPath, TimeType, Timeline}; use re_types::{components::InstanceKey, Loggable}; @@ -56,7 +56,7 @@ fn main() { &query, &ent_path, Rect2D::name(), - [InstanceKey::name(), Rect2D::name(), LegacyPoint2D::name()], + [InstanceKey::name(), Rect2D::name(), Point2D::name()], &JoinType::Outer, ); for (time, df) in dfs.map(Result::unwrap) { @@ -77,8 +77,8 @@ fn main() { &store, &query, &ent_path, - LegacyPoint2D::name(), - [InstanceKey::name(), Rect2D::name(), LegacyPoint2D::name()], + Point2D::name(), + [InstanceKey::name(), Rect2D::name(), Point2D::name()], &JoinType::Outer, ); for (time, df) in dfs.map(Result::unwrap) { @@ -88,7 +88,7 @@ fn main() { || "".into(), |time| TimeType::Sequence.format(time) ), - LegacyPoint2D::name(), + Point2D::name(), df, ); } diff --git a/crates/re_arrow_store/tests/correctness.rs b/crates/re_arrow_store/tests/correctness.rs index 71cbb7b4544ec..efb7252989db2 100644 --- a/crates/re_arrow_store/tests/correctness.rs +++ b/crates/re_arrow_store/tests/correctness.rs @@ -217,7 +217,7 @@ fn range_join_across_single_row_impl(store: &mut DataStore) { prelude::{DataFrame, JoinType}, series::Series, }; - use re_components::{ColorRGBA, LegacyPoint2D}; + use re_components::{ColorRGBA, Point2D}; let ent_path = EntityPath::from("this/that"); @@ -232,16 +232,12 @@ fn range_join_across_single_row_impl(store: &mut DataStore) { timeline_frame_nr, re_arrow_store::TimeRange::new(i64::MIN.into(), i64::MAX.into()), ); - let components = [ - InstanceKey::name(), - LegacyPoint2D::name(), - ColorRGBA::name(), - ]; + let components = [InstanceKey::name(), Point2D::name(), ColorRGBA::name()]; let dfs = re_arrow_store::polars_util::range_components( store, &query, &ent_path, - LegacyPoint2D::name(), + Point2D::name(), components, &JoinType::Outer, ) @@ -250,12 +246,12 @@ fn range_join_across_single_row_impl(store: &mut DataStore) { let df_expected = { let instances = InstanceKey::to_arrow(vec![InstanceKey(0), InstanceKey(1), InstanceKey(2)], None); - let points = LegacyPoint2D::to_arrow(points, None); + let points = Point2D::to_arrow(points.into_iter().map(|p| Point2D::new(p.x, p.y)), None); let colors = ColorRGBA::to_arrow(colors, None); DataFrame::new(vec![ Series::try_from((InstanceKey::name().as_ref(), instances)).unwrap(), - Series::try_from((LegacyPoint2D::name().as_ref(), points)).unwrap(), + Series::try_from((Point2D::name().as_ref(), points)).unwrap(), Series::try_from((ColorRGBA::name().as_ref(), colors)).unwrap(), ]) .unwrap() diff --git a/crates/re_arrow_store/tests/data_store.rs b/crates/re_arrow_store/tests/data_store.rs index 0c44709c72613..fb5e0c6759192 100644 --- a/crates/re_arrow_store/tests/data_store.rs +++ b/crates/re_arrow_store/tests/data_store.rs @@ -19,7 +19,7 @@ use re_components::{ build_frame_nr, build_some_colors, build_some_instances, build_some_instances_from, build_some_point2d, build_some_rects, }, - ColorRGBA, InstanceKey, LegacyPoint2D, Rect2D, + ColorRGBA, InstanceKey, Point2D, Rect2D, }; use re_log_types::{DataCell, DataRow, DataTable, EntityPath, TableId, TimeType, Timeline}; use re_types::{ComponentName, Loggable as _}; @@ -94,7 +94,7 @@ fn all_components() { let components_b = &[ ColorRGBA::name(), // added by test, timeless - LegacyPoint2D::name(), // added by test + Point2D::name(), // added by test Rect2D::name(), // added by test cluster_key, // always here ]; @@ -150,7 +150,7 @@ fn all_components() { let components_b = &[ ColorRGBA::name(), // added by test, timeless Rect2D::name(), // ⚠ inherited before the buckets got split apart! - LegacyPoint2D::name(), // added by test + Point2D::name(), // added by test cluster_key, // always here ]; @@ -210,7 +210,7 @@ fn all_components() { let components_b = &[ ColorRGBA::name(), // added by test, timeless - LegacyPoint2D::name(), // added by test but not contained in the second bucket + Point2D::name(), // added by test but not contained in the second bucket Rect2D::name(), // added by test cluster_key, // always here ]; @@ -312,7 +312,7 @@ fn latest_at_impl(store: &mut DataStore) { let mut assert_latest_components = |frame_nr: TimeInt, rows: &[(ComponentName, &DataRow)]| { let timeline_frame_nr = Timeline::new("frame_nr", TimeType::Sequence); - let components_all = &[ColorRGBA::name(), LegacyPoint2D::name()]; + let components_all = &[ColorRGBA::name(), Point2D::name()]; let df = polars_util::latest_components( &store, @@ -333,26 +333,26 @@ fn latest_at_impl(store: &mut DataStore) { assert_latest_components( frame0, - &[(ColorRGBA::name(), &row4), (LegacyPoint2D::name(), &row3)], // timeless + &[(ColorRGBA::name(), &row4), (Point2D::name(), &row3)], // timeless ); assert_latest_components( frame1, &[ (ColorRGBA::name(), &row1), - (LegacyPoint2D::name(), &row3), // timeless + (Point2D::name(), &row3), // timeless ], ); assert_latest_components( frame2, - &[(ColorRGBA::name(), &row1), (LegacyPoint2D::name(), &row2)], + &[(ColorRGBA::name(), &row1), (Point2D::name(), &row2)], ); assert_latest_components( frame3, - &[(ColorRGBA::name(), &row1), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row1), (Point2D::name(), &row3)], ); assert_latest_components( frame4, - &[(ColorRGBA::name(), &row4), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4), (Point2D::name(), &row3)], ); } @@ -507,96 +507,96 @@ fn range_impl(store: &mut DataStore) { assert_range_components( TimeRange::new(frame1, frame1), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ ( Some(frame0), &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), ], ), // timeless ( Some(frame1), &[ (ColorRGBA::name(), &row1), - (LegacyPoint2D::name(), &row4_4), // timeless + (Point2D::name(), &row4_4), // timeless ], ), ], ); assert_range_components( TimeRange::new(frame2, frame2), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ ( Some(frame1), &[ (ColorRGBA::name(), &row1), - (LegacyPoint2D::name(), &row4_4), // timeless + (Point2D::name(), &row4_4), // timeless ], ), // ], ); assert_range_components( TimeRange::new(frame3, frame3), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ ( Some(frame2), - &[(ColorRGBA::name(), &row1), (LegacyPoint2D::name(), &row2)], + &[(ColorRGBA::name(), &row1), (Point2D::name(), &row2)], ), // ], ); assert_range_components( TimeRange::new(frame4, frame4), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ ( Some(frame3), - &[(ColorRGBA::name(), &row1), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row1), (Point2D::name(), &row3)], ), ( Some(frame4), - &[(ColorRGBA::name(), &row4_1), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_1), (Point2D::name(), &row3)], ), ( Some(frame4), - &[(ColorRGBA::name(), &row4_2), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_2), (Point2D::name(), &row3)], ), ( Some(frame4), &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), ], // !!! ), ], ); assert_range_components( TimeRange::new(frame5, frame5), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ ( Some(frame4), &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), ], // !!! ), // ], ); - // Unit ranges (LegacyPoint2D's PoV) + // Unit ranges (Point2D's PoV) assert_range_components( TimeRange::new(frame1, frame1), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( Some(frame0), &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ), // timeless @@ -604,54 +604,54 @@ fn range_impl(store: &mut DataStore) { ); assert_range_components( TimeRange::new(frame2, frame2), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( Some(frame1), &[ - (LegacyPoint2D::name(), &row4_4), // timeless + (Point2D::name(), &row4_4), // timeless (ColorRGBA::name(), &row1), ], ), ( Some(frame2), - &[(LegacyPoint2D::name(), &row2), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row2), (ColorRGBA::name(), &row1)], ), // ], ); assert_range_components( TimeRange::new(frame3, frame3), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( Some(frame2), - &[(LegacyPoint2D::name(), &row2), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row2), (ColorRGBA::name(), &row1)], ), ( Some(frame3), - &[(LegacyPoint2D::name(), &row3), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row3), (ColorRGBA::name(), &row1)], ), ], ); assert_range_components( TimeRange::new(frame4, frame4), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( Some(frame3), - &[(LegacyPoint2D::name(), &row3), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row3), (ColorRGBA::name(), &row1)], ), ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), (ColorRGBA::name(), &row4_2), ], ), ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ), @@ -659,12 +659,12 @@ fn range_impl(store: &mut DataStore) { ); assert_range_components( TimeRange::new(frame5, frame5), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ), // @@ -675,72 +675,72 @@ fn range_impl(store: &mut DataStore) { assert_range_components( TimeRange::new(frame1, frame5), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ ( Some(frame0), &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), ], ), // timeless ( Some(frame1), &[ (ColorRGBA::name(), &row1), - (LegacyPoint2D::name(), &row4_4), // timeless + (Point2D::name(), &row4_4), // timeless ], ), ( Some(frame4), - &[(ColorRGBA::name(), &row4_1), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_1), (Point2D::name(), &row3)], ), ( Some(frame4), - &[(ColorRGBA::name(), &row4_2), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_2), (Point2D::name(), &row3)], ), ( Some(frame4), &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), ], // !!! ), ], ); - // Full range (LegacyPoint2D's PoV) + // Full range (Point2D's PoV) assert_range_components( TimeRange::new(frame1, frame5), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( Some(frame0), &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ), // timeless ( Some(frame2), - &[(LegacyPoint2D::name(), &row2), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row2), (ColorRGBA::name(), &row1)], ), ( Some(frame3), - &[(LegacyPoint2D::name(), &row3), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row3), (ColorRGBA::name(), &row1)], ), ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), (ColorRGBA::name(), &row4_2), ], ), ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ), @@ -751,96 +751,96 @@ fn range_impl(store: &mut DataStore) { assert_range_components( TimeRange::new(TimeInt::MIN, TimeInt::MAX), - [ColorRGBA::name(), LegacyPoint2D::name()], + [ColorRGBA::name(), Point2D::name()], &[ (None, &[(ColorRGBA::name(), &row1)]), ( None, - &[(ColorRGBA::name(), &row4_1), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_1), (Point2D::name(), &row3)], ), ( None, - &[(ColorRGBA::name(), &row4_2), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_2), (Point2D::name(), &row3)], ), ( None, &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), ], // !!! ), ( Some(frame1), &[ (ColorRGBA::name(), &row1), - (LegacyPoint2D::name(), &row4_4), // timeless + (Point2D::name(), &row4_4), // timeless ], ), ( Some(frame4), - &[(ColorRGBA::name(), &row4_1), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_1), (Point2D::name(), &row3)], ), ( Some(frame4), - &[(ColorRGBA::name(), &row4_2), (LegacyPoint2D::name(), &row3)], + &[(ColorRGBA::name(), &row4_2), (Point2D::name(), &row3)], ), ( Some(frame4), &[ (ColorRGBA::name(), &row4_3), - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), ], // !!! ), ], ); - // Infinite range (LegacyPoint2D's PoV) + // Infinite range (Point2D's PoV) assert_range_components( TimeRange::new(TimeInt::MIN, TimeInt::MAX), - [LegacyPoint2D::name(), ColorRGBA::name()], + [Point2D::name(), ColorRGBA::name()], &[ ( None, - &[(LegacyPoint2D::name(), &row2), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row2), (ColorRGBA::name(), &row1)], ), ( None, - &[(LegacyPoint2D::name(), &row3), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row3), (ColorRGBA::name(), &row1)], ), ( None, &[ - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), (ColorRGBA::name(), &row4_2), ], ), ( None, &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ), ( Some(frame2), - &[(LegacyPoint2D::name(), &row2), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row2), (ColorRGBA::name(), &row1)], ), ( Some(frame3), - &[(LegacyPoint2D::name(), &row3), (ColorRGBA::name(), &row1)], + &[(Point2D::name(), &row3), (ColorRGBA::name(), &row1)], ), ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_25), + (Point2D::name(), &row4_25), (ColorRGBA::name(), &row4_2), ], ), ( Some(frame4), &[ - (LegacyPoint2D::name(), &row4_4), + (Point2D::name(), &row4_4), (ColorRGBA::name(), &row4_3), ], ),