Skip to content

Commit

Permalink
Don't inline recursive datatypes in Rust backend (#2760)
Browse files Browse the repository at this point in the history 
Fixes #2759 

### What

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/2760) (if
applicable)

- [PR Build Summary](https://build.rerun.io/pr/2760)
- [Docs
preview](https://rerun.io/preview/pr%3Acmc%2Fdatatype_no_rec/docs)
- [Examples
preview](https://rerun.io/preview/pr%3Acmc%2Fdatatype_no_rec/examples)
  • Loading branch information
@teh-cmc
teh-cmc authored Jul 20, 2023
1 parent d2c427d commit 395d117
Show file tree
Hide file tree
Showing 11 changed files with 90 additions and 3,620 deletions.
2 changes: 1 addition & 1 deletion crates/re_types/source_hash.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
# It can be safely removed at anytime to force the build script to run again.
# Check out build.rs to see how it's computed.
e45f620a5a7e37189161bd67ebaa7b111fa0569a315fb28bd960dd0e564b1149
9c75fa33055b75b1c29e08cddae47be88c686d3a20a97bcd584dfa664bc1c479
1,849 changes: 44 additions & 1,805 deletions crates/re_types/src/components/fuzzy.rs
View file

Large diffs are not rendered by default.

178 changes: 2 additions & 176 deletions crates/re_types/src/components/transform3d.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,187 +54,13 @@ impl crate::Loggable for Transform3D {
},
Field {
name: "TranslationAndMat3x3".to_owned(),
data_type: DataType::Struct(vec![
Field {
name: "translation".to_owned(),
data_type: DataType::FixedSizeList(
Box::new(Field {
name: "item".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
}),
3usize,
),
is_nullable: true,
metadata: [].into(),
},
Field {
name: "matrix".to_owned(),
data_type: DataType::FixedSizeList(
Box::new(Field {
name: "item".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
}),
9usize,
),
is_nullable: true,
metadata: [].into(),
},
Field {
name: "from_parent".to_owned(),
data_type: DataType::Boolean,
is_nullable: false,
metadata: [].into(),
},
]),
data_type: <crate::datatypes::TranslationAndMat3x3>::to_arrow_datatype(),
is_nullable: false,
metadata: [].into(),
},
Field {
name: "TranslationRotationScale".to_owned(),
data_type: DataType::Struct(vec![
Field {
name: "translation".to_owned(),
data_type: DataType::FixedSizeList(
Box::new(Field {
name: "item".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
}),
3usize,
),
is_nullable: true,
metadata: [].into(),
},
Field {
name: "rotation".to_owned(),
data_type: DataType::Union(
vec![
Field {
name: "_null_markers".to_owned(),
data_type: DataType::Null,
is_nullable: true,
metadata: [].into(),
},
Field {
name: "Quaternion".to_owned(),
data_type: DataType::FixedSizeList(
Box::new(Field {
name: "item".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
}),
4usize,
),
is_nullable: false,
metadata: [].into(),
},
Field {
name: "AxisAngle".to_owned(),
data_type: DataType::Struct(vec![
Field {
name: "axis".to_owned(),
data_type: DataType::FixedSizeList(
Box::new(Field {
name: "item".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
}),
3usize,
),
is_nullable: false,
metadata: [].into(),
},
Field {
name: "angle".to_owned(),
data_type: DataType::Union(
vec![
Field {
name: "_null_markers".to_owned(),
data_type: DataType::Null,
is_nullable: true,
metadata: [].into(),
},
Field {
name: "Radians".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
},
Field {
name: "Degrees".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
},
],
Some(vec![0i32, 1i32, 2i32]),
UnionMode::Dense,
),
is_nullable: false,
metadata: [].into(),
},
]),
is_nullable: false,
metadata: [].into(),
},
],
Some(vec![0i32, 1i32, 2i32]),
UnionMode::Dense,
),
is_nullable: true,
metadata: [].into(),
},
Field {
name: "scale".to_owned(),
data_type: DataType::Union(
vec![
Field {
name: "_null_markers".to_owned(),
data_type: DataType::Null,
is_nullable: true,
metadata: [].into(),
},
Field {
name: "ThreeD".to_owned(),
data_type: DataType::FixedSizeList(
Box::new(Field {
name: "item".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
}),
3usize,
),
is_nullable: false,
metadata: [].into(),
},
Field {
name: "Uniform".to_owned(),
data_type: DataType::Float32,
is_nullable: false,
metadata: [].into(),
},
],
Some(vec![0i32, 1i32, 2i32]),
UnionMode::Dense,
),
is_nullable: true,
metadata: [].into(),
},
Field {
name: "from_parent".to_owned(),
data_type: DataType::Boolean,
is_nullable: false,
metadata: [].into(),
},
]),
data_type: <crate::datatypes::TranslationRotationScale3D>::to_arrow_datatype(),
is_nullable: false,
metadata: [].into(),
},
Expand Down
Loading

0 comments on commit 395d117

Please sign in to comment.