fix merge race between #665 & #666 (#670)

* all the new derives * arrow2-convert with windows patch * Revert "all the new derives" This reverts commit a2f5cf4. * dude please run the CI??? This reverts commit c0ef309.
rerun-io · Jan 4, 2023 · b839da5 · b839da5 · github-actions · Jan 4, 2023
1 parent 034f103
commit b839da5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -66,6 +66,6 @@ wgpu-core = { git = "https://github.com/gfx-rs/wgpu.git", ref = "a377ae2b7fe6c1c
 # Upstream PR https://github.com/jorgecarleitao/arrow2/pull/1334 merged, but not released
 arrow2 = { git = "https://github.com/rerun-io/arrow2", rev = "26d1b1139ac3db22c4973772ddb0d30c16027ff6" }
 # Upstream PRs https://github.com/DataEngineeringLabs/arrow2-convert/pull/88 and https://github.com/DataEngineeringLabs/arrow2-convert/pull/89
-arrow2_convert = { git = "https://github.com/rerun-io/arrow2-convert", rev = "5b98b537d8095fac807bb6f018536125668f7e90" }
+arrow2_convert = { git = "https://github.com/rerun-io/arrow2-convert", rev = "1e770145fd2fbd4a4c9ac47d3d527959e8c0bb69" }
 #arrow2 = { path = "../arrow2" }
 #arrow2_convert = { path = "../arrow2-convert/arrow2_convert" }
diff --git a/crates/re_log_types/src/field_types/scalar.rs b/crates/re_log_types/src/field_types/scalar.rs
@@ -75,7 +75,14 @@ impl Component for Scalar {
 ///     ])
 /// );
 /// ```
-#[derive(Debug, Clone, Copy, arrow2_convert::ArrowField)]
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    arrow2_convert::ArrowField,
+    arrow2_convert::ArrowSerialize,
+    arrow2_convert::ArrowDeserialize,
+)]
 pub struct ScalarPlotProps {
     pub scattered: bool,
 }
Benchmark suite	Current: `b839da5`	Previous: `034f103`	Ratio
`datastore/insert/batch/rects/insert`	`271022` ns/iter (`± 1783`)	`281468` ns/iter (`± 2667`)	`0.96`
`datastore/latest_at/batch/rects/query`	`719` ns/iter (`± 0`)	`712` ns/iter (`± 2`)	`1.01`
`datastore/latest_at/missing_components/primary`	`305` ns/iter (`± 0`)	`306` ns/iter (`± 0`)	`1.00`
`datastore/latest_at/missing_components/secondaries`	`371` ns/iter (`± 0`)	`372` ns/iter (`± 0`)	`1.00`
`datastore/range/batch/rects/query`	`46012` ns/iter (`± 24`)	`45102` ns/iter (`± 33`)	`1.02`
`obj_mono_points/insert`	`854075445` ns/iter (`± 5817341`)	`1241247556` ns/iter (`± 15165627`)	`0.69`
`obj_mono_points/query`	`357409` ns/iter (`± 1564`)	`375319` ns/iter (`± 7144`)	`0.95`
`obj_batch_points/insert`	`86773613` ns/iter (`± 325383`)	`116090396` ns/iter (`± 731483`)	`0.75`
`obj_batch_points/query`	`11446` ns/iter (`± 64`)	`11495` ns/iter (`± 33`)	`1.00`
`obj_batch_points_sequential/insert`	`22818093` ns/iter (`± 188181`)	`26422364` ns/iter (`± 306849`)	`0.86`
`obj_batch_points_sequential/query`	`7985` ns/iter (`± 25`)	`7972` ns/iter (`± 11`)	`1.00`
`mono_points_classic/generate_messages`	`4331351` ns/iter (`± 64575`)	`6664583` ns/iter (`± 1166702`)	`0.65`
`mono_points_classic/encode_log_msg`	`11176053` ns/iter (`± 448312`)	`17089648` ns/iter (`± 576862`)	`0.65`
`mono_points_classic/encode_total`	`15500556` ns/iter (`± 937565`)	`22787506` ns/iter (`± 2643036`)	`0.68`
`mono_points_classic/decode_total`	`35464410` ns/iter (`± 624032`)	`43060939` ns/iter (`± 1065491`)	`0.82`
`mono_points_arrow/generate_message_bundles`	`49283822` ns/iter (`± 749976`)	`66739347` ns/iter (`± 1081415`)	`0.74`
`mono_points_arrow/generate_messages`	`126132857` ns/iter (`± 960380`)	`174560698` ns/iter (`± 1886650`)	`0.72`
`mono_points_arrow/encode_log_msg`	`156440977` ns/iter (`± 1414541`)	`207816459` ns/iter (`± 6067174`)	`0.75`
`mono_points_arrow/encode_total`	`332162445` ns/iter (`± 1752232`)	`449207605` ns/iter (`± 5154956`)	`0.74`
`mono_points_arrow/decode_log_msg`	`180181668` ns/iter (`± 1309728`)	`221086532` ns/iter (`± 1644215`)	`0.81`
`mono_points_arrow/decode_message_bundles`	`71589682` ns/iter (`± 978238`)	`114545412` ns/iter (`± 1612205`)	`0.62`
`mono_points_arrow/decode_total`	`245915978` ns/iter (`± 1611514`)	`325496189` ns/iter (`± 2707486`)	`0.76`
`batch_points_classic/generate_messages`	`3376` ns/iter (`± 30`)	`3446` ns/iter (`± 136`)	`0.98`
`batch_points_classic/encode_log_msg`	`423176` ns/iter (`± 677`)	`389407` ns/iter (`± 3235`)	`1.09`
`batch_points_classic/encode_total`	`430502` ns/iter (`± 697`)	`395509` ns/iter (`± 10526`)	`1.09`
`batch_points_classic/decode_total`	`725740` ns/iter (`± 1282`)	`748744` ns/iter (`± 7392`)	`0.97`
`batch_points_arrow/generate_message_bundles`	`323308` ns/iter (`± 695`)	`333959` ns/iter (`± 1130`)	`0.97`
`batch_points_arrow/generate_messages`	`6277` ns/iter (`± 15`)	`6230` ns/iter (`± 17`)	`1.01`
`batch_points_arrow/encode_log_msg`	`366707` ns/iter (`± 1750`)	`372267` ns/iter (`± 6602`)	`0.99`
`batch_points_arrow/encode_total`	`715067` ns/iter (`± 2036`)	`749704` ns/iter (`± 17782`)	`0.95`
`batch_points_arrow/decode_log_msg`	`350408` ns/iter (`± 1448`)	`364502` ns/iter (`± 5529`)	`0.96`
`batch_points_arrow/decode_message_bundles`	`2169` ns/iter (`± 6`)	`2116` ns/iter (`± 6`)	`1.03`
`batch_points_arrow/decode_total`	`356378` ns/iter (`± 1043`)	`364375` ns/iter (`± 11180`)	`0.98`
`arrow_mono_points/insert`	`5934314503` ns/iter (`± 18769024`)	`9976262179` ns/iter (`± 111747850`)	`0.59`
`arrow_mono_points/query`	`1623048` ns/iter (`± 8501`)	`1740537` ns/iter (`± 151648`)	`0.93`
`arrow_batch_points/insert`	`2576033` ns/iter (`± 10728`)	`2719421` ns/iter (`± 63068`)	`0.95`
`arrow_batch_points/query`	`13779` ns/iter (`± 28`)	`12919` ns/iter (`± 14`)	`1.07`
`obj_batch_points_sequential/Tuid::random`	`37` ns/iter (`± 0`)	`38` ns/iter (`± 0`)	`0.97`