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.

Sign up for GitHub

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

Streaming errors for encoders #7093

Merged
merged 4 commits into from
Aug 8, 2024
Merged

Streaming errors for encoders #7093

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cadb99
make EntityDb::to_messages stream its output
teh-cmc Aug 6, 2024
72d1f5e
streamable encoders, even in the face of errors
teh-cmc Aug 6, 2024
63d1ece
propagate changes
teh-cmc Aug 6, 2024
98dcaee
rrd merge|compact: streamed output
teh-cmc Aug 6, 2024
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
Prev Previous commit
Loading
Loading status checks…
rrd merge|compact: streamed output
@teh-cmc
teh-cmc committed Aug 8, 2024
commit 98dcaee6d751a3ad2532c767cdffe86878cf4dc1
16 changes: 5 additions & 11 deletions crates/top/rerun/src/commands/rrd/merge_compact.rs
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ use anyhow::Context as _;

use re_chunk_store::ChunkStoreConfig;
use re_entity_db::EntityDb;
use re_log_types::{LogMsg, StoreId};
use re_log_types::StoreId;
use re_sdk::StoreKind;

use crate::commands::read_rrd_streams_from_file_or_stdin;
@@ -199,21 +199,15 @@ fn merge_and_compact(
let mut rrd_out = std::fs::File::create(&path_to_output_rrd)
.with_context(|| format!("{path_to_output_rrd:?}"))?;

let messages_rbl: Result<Vec<Vec<LogMsg>>, _> = entity_dbs
let messages_rbl = entity_dbs
.values()
.filter(|entity_db| entity_db.store_kind() == StoreKind::Blueprint)
.map(|entity_db| entity_db.to_messages(None /* time selection */))
.collect();
let messages_rbl = messages_rbl?;
let messages_rbl = messages_rbl.iter().flatten();
.flat_map(|entity_db| entity_db.to_messages(None /* time selection */));

let messages_rrd: Result<Vec<Vec<LogMsg>>, _> = entity_dbs
let messages_rrd = entity_dbs
.values()
.filter(|entity_db| entity_db.store_kind() == StoreKind::Recording)
.map(|entity_db| entity_db.to_messages(None /* time selection */))
.collect();
let messages_rrd = messages_rrd?;
let messages_rrd = messages_rrd.iter().flatten();
.flat_map(|entity_db| entity_db.to_messages(None /* time selection */));

let encoding_options = re_log_encoding::EncodingOptions::COMPRESSED;
let version = entity_dbs