Replace TransportChunk with re_sorbet::ChunkBatch

Cargo.lock

@@ -5832,11 +5832,11 @@ dependencies = [
  "re_format_arrow",
  "re_log",
  "re_log_types",
+ "re_sorbet",
  "re_tracing",
  "re_tuid",
  "re_types_core",
  "similar-asserts",
- "tap",
  "thiserror 1.0.65",
 ]
 
@@ -6049,6 +6049,7 @@ dependencies = [
  "re_log_encoding",
  "re_log_types",
  "re_query",
+ "re_sorbet",
  "re_tracing",
  "re_types",
  "re_types_core",
@@ -6159,6 +6160,7 @@ dependencies = [
  "re_log_types",
  "re_protos",
  "re_smart_channel",
+ "re_sorbet",
  "re_types",
  "thiserror 1.0.65",
  "tokio",
@@ -6186,6 +6188,7 @@ dependencies = [
  "re_smart_channel",
  "re_tracing",
  "re_types",
+ "similar-asserts",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -6574,8 +6577,13 @@ name = "re_sorbet"
 version = "0.23.0-alpha.1+dev"
 dependencies = [
  "arrow",
+ "itertools 0.13.0",
+ "re_arrow_util",
+ "re_format_arrow",
  "re_log",
  "re_log_types",
+ "re_tracing",
+ "re_tuid",
  "re_types_core",
  "thiserror 1.0.65",
 ]
@@ -7464,6 +7472,7 @@ dependencies = [
  "re_memory",
  "re_sdk",
  "re_smart_channel",
+ "re_sorbet",
  "re_tracing",
  "re_types",
  "re_video",
@@ -8651,12 +8660,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"

crates/store/re_chunk/Cargo.toml

@@ -32,10 +32,11 @@ serde = ["re_log_types/serde", "re_tuid/serde", "re_types_core/serde"]
 re_arrow_util.workspace = true
 re_byte_size.workspace = true
 re_error.workspace = true
-re_format.workspace = true
 re_format_arrow.workspace = true
-re_log.workspace = true
+re_format.workspace = true
 re_log_types.workspace = true
+re_log.workspace = true
+re_sorbet.workspace = true
 re_tracing.workspace = true
 re_tuid.workspace = true
 re_types_core.workspace = true
@@ -51,7 +52,6 @@ itertools.workspace = true
 nohash-hasher.workspace = true
 rand = { workspace = true, features = ["std_rng"] }
 similar-asserts.workspace = true
-tap.workspace = true
 thiserror.workspace = true
 
 # Native dependencies:

crates/store/re_chunk/src/chunk.rs

@@ -45,6 +45,18 @@ pub enum ChunkError {
 
     #[error("Deserialization: {0}")]
     Deserialization(#[from] DeserializationError),
+
+    #[error(transparent)]
+    UnsupportedTimeType(#[from] re_sorbet::UnsupportedTimeType),
+
+    #[error(transparent)]
+    WrongDatatypeError(#[from] re_sorbet::WrongDatatypeError),
+
+    #[error(transparent)]
+    MismatchedChunkSchemaError(#[from] re_sorbet::MismatchedChunkSchemaError),
+
+    #[error(transparent)]
+    InvalidChunkSchema(#[from] re_sorbet::InvalidChunkSchema),
 }
 
 pub type ChunkResult<T> = Result<T, ChunkError>;
@@ -170,7 +182,7 @@ impl FromIterator<(ComponentName, ArrowListArray)> for ChunkComponents {
 /// Its time columns might or might not be ascendingly sorted, depending on how the data was logged.
 ///
 /// This is the in-memory representation of a chunk, optimized for efficient manipulation of the
-/// data within. For transport, see [`crate::TransportChunk`] instead.
+/// data within. For transport, see [`re_sorbet::ChunkBatch`] instead.
 #[derive(Debug)]
 pub struct Chunk {
     pub(crate) id: ChunkId,
@@ -1262,11 +1274,11 @@ impl Chunk {
 impl std::fmt::Display for Chunk {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let transport_chunk = self.to_transport().map_err(|err| {
+        let batch = self.to_record_batch().map_err(|err| {
             re_log::error_once!("couldn't display Chunk: {err}");
             std::fmt::Error
         })?;
-        transport_chunk.fmt(f)
+        re_format_arrow::format_record_batch_with_width(&batch, f.width()).fmt(f)
     }
 }
 
@@ -1435,6 +1447,7 @@ impl Chunk {
     /// Returns an error if the Chunk's invariants are not upheld.
     ///
     /// Costly checks are only run in debug builds.
+    #[track_caller]
     pub fn sanity_check(&self) -> ChunkResult<()> {
         re_tracing::profile_function!();
 
@@ -1504,8 +1517,10 @@ impl Chunk {
         }
 
         // Components
-        for (_component_name, per_desc) in components.iter() {
+        for (component_name, per_desc) in components.iter() {
+            component_name.sanity_check();
             for (component_desc, list_array) in per_desc {
+                component_desc.component_name.sanity_check();
                 if !matches!(list_array.data_type(), arrow::datatypes::DataType::List(_)) {
                     return Err(ChunkError::Malformed {
                         reason: format!(
@@ -1556,6 +1571,7 @@ impl TimeColumn {
     /// Returns an error if the Chunk's invariants are not upheld.
     ///
     /// Costly checks are only run in debug builds.
+    #[track_caller]
     pub fn sanity_check(&self) -> ChunkResult<()> {
         let Self {
             timeline: _,

crates/store/re_chunk/src/lib.rs

@@ -29,7 +29,6 @@ pub use self::iter::{
 };
 pub use self::latest_at::LatestAtQuery;
 pub use self::range::{RangeQuery, RangeQueryOptions};
-pub use self::transport::TransportChunk;
 
 #[cfg(not(target_arch = "wasm32"))]
 pub use self::batcher::{