Skip to content

Commit 7f59051

Browse files
committed
rebase
1 parent e78f88f commit 7f59051

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

crates/store/re_redap_tests/src/tests/snapshots/re_redap_tests__tests__query_dataset__simple_dataset_exclude_static_schema.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ chunk_is_static: bool [
1212
rerun:kind:control
1313
]
1414
chunk_key: Binary
15-
chunk_partition_id: Utf8 [
15+
chunk_segment_id: Utf8 [
1616
rerun:kind:control
1717
]
18-
rerun_partition_layer: Utf8
18+
rerun_segment_layer: Utf8

crates/store/re_server/src/rerun_cloud.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -993,18 +993,15 @@ impl RerunCloudService for RerunCloudHandler {
993993
exclude_temporal_data,
994994
scan_parameters,
995995
query: _,
996-
} = request.into_inner();
996+
} = request.into_inner().try_into()?;
997997

998998
if scan_parameters.is_some() {
999999
re_log::warn_once!(
10001000
"query_dataset: scan_parameters are not yet implemented and will be ignored"
10011001
);
10021002
}
10031003

1004-
let entity_paths: IntSet<EntityPath> = entity_paths
1005-
.into_iter()
1006-
.map(EntityPath::try_from)
1007-
.collect::<Result<IntSet<EntityPath>, _>>()?;
1004+
let entity_paths: IntSet<EntityPath> = entity_paths.into_iter().collect();
10081005
if select_all_entity_paths && !entity_paths.is_empty() {
10091006
return Err(tonic::Status::invalid_argument(
10101007
"cannot specify entity paths if `select_all_entity_paths` is true",
@@ -1042,8 +1039,8 @@ impl RerunCloudService for RerunCloudHandler {
10421039
continue;
10431040
}
10441041

1045-
let tuid = chunk.id().as_tuid().into();
1046-
if !requested_chunk_ids.is_empty() && !requested_chunk_ids.contains(&tuid) {
1042+
if !requested_chunk_ids.is_empty() && !requested_chunk_ids.contains(&chunk.id())
1043+
{
10471044
continue;
10481045
}
10491046

0 commit comments

Comments
 (0)