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.

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

arrow2-convert migration 2: non-serde blueprint types #3855

Merged
merged 9 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions crates/re_arrow_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ name = "arrow2"
harness = false
required-features = ["testing"]

[[bench]]
name = "arrow2_convert"
harness = false
required-features = ["testing"]

[[bench]]
name = "vectors"
harness = false
145 changes: 0 additions & 145 deletions crates/re_arrow_store/benches/arrow2_convert.rs

This file was deleted.

4 changes: 4 additions & 0 deletions crates/re_types/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions crates/re_types/definitions/rerun/archetypes.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ include "./archetypes/view_coordinates.fbs";

include "./testing/archetypes/fuzzy.fbs";

// NOTE: The current file is the entrypoint for codegen, and so we need to import
// the blueprint types here otherwise nothing will.
include "./blueprint.fbs";

namespace rerun.archetypes;
2 changes: 2 additions & 0 deletions crates/re_types/definitions/rerun/blueprint.fbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include "./blueprint/auto_space_views.fbs";
include "./blueprint/panel_view.fbs";
22 changes: 22 additions & 0 deletions crates/re_types/definitions/rerun/blueprint/auto_space_views.fbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
include "arrow/attributes.fbs";
include "python/attributes.fbs";
include "rust/attributes.fbs";

include "rerun/datatypes.fbs";
include "rerun/attributes.fbs";

namespace rerun.blueprint;

// ---

/// A flag indicating space views should be automatically populated.
///
/// Unstable. Used for the ongoing blueprint experimentations.
struct AutoSpaceViews (
"attr.arrow.transparent",
"attr.rust.derive": "Copy, Default",
"attr.rust.repr": "transparent",
"attr.rust.tuple_struct"
) {
enabled: bool (order: 100);
}
19 changes: 19 additions & 0 deletions crates/re_types/definitions/rerun/blueprint/panel_view.fbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
include "arrow/attributes.fbs";
include "python/attributes.fbs";
include "rust/attributes.fbs";

include "rerun/datatypes.fbs";
include "rerun/attributes.fbs";

namespace rerun.blueprint;

// ---

/// The state of the panels.
///
/// Unstable. Used for the ongoing blueprint experimentations.
struct PanelView (
"attr.rust.derive": "Copy"
) {
is_expanded: bool (order: 100);
}
129 changes: 129 additions & 0 deletions crates/re_types/src/blueprint/auto_space_views.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions crates/re_types/src/blueprint/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading