Merge branch 'main' into cmc/python_partial_updates

.vscode/settings.json

@@ -46,11 +46,7 @@
     // Uncomment the following options and restart rust-analyzer to get it to check code behind `cfg(target_arch=wasm32)`.
     // Don't forget to put it in a comment again before committing.
     // "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
-    // "rust-analyzer.cargo.cfgs": {
-    //     "web": null,
-    //     "webgl": null,
-    //     "webgpu": null,
-    // },
+    // "rust-analyzer.cargo.cfgs": ["web","webgl","webgpu"],
 
     "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", // Use cmake-tools to grab configs.
     "C_Cpp.autoAddFileAssociations": false,

Cargo.lock

@@ -5913,6 +5913,7 @@ version = "0.22.0-alpha.1+dev"
 dependencies = [
  "anyhow",
  "arrow",
+ "insta",
  "itertools 0.13.0",
  "nohash-hasher",
  "rayon",

crates/store/re_chunk/src/arrow.rs

@@ -13,11 +13,9 @@ impl TransportChunk {
     /// related rust structures that refer to those data buffers.
     pub fn try_to_arrow_record_batch(&self) -> Result<RecordBatch, ArrowError> {
         let columns: Vec<_> = self
-            .all_columns()
-            .map(|(_field, arr2_array)| {
-                let data = arrow2::array::to_data(arr2_array.as_ref());
-                make_array(data)
-            })
+            .columns()
+            .iter()
+            .map(|arr2_array| make_array(arrow2::array::to_data(*arr2_array)))
             .collect();
 
         RecordBatch::try_new(self.schema(), columns)

crates/store/re_chunk/src/transport.rs

@@ -63,6 +63,7 @@ impl std::fmt::Display for TransportChunk {
                 .iter()
                 .map(|list_array| ArrowArrayRef::from(list_array.clone()))
                 .collect_vec(),
+            f.width(),
         )
         .fmt(f)
     }
@@ -380,7 +381,7 @@ impl TransportChunk {
     /// * [`Self::FIELD_METADATA_VALUE_KIND_CONTROL`]
     /// * [`Self::FIELD_METADATA_VALUE_KIND_DATA`]
     #[inline]
-    pub fn columns<'a>(
+    fn columns_of_kind<'a>(
         &'a self,
         kind: &'a str,
     ) -> impl Iterator<Item = (&'a ArrowField, &'a Box<dyn Arrow2Array>)> + 'a {
@@ -402,7 +403,9 @@ impl TransportChunk {
     }
 
     #[inline]
-    pub fn all_columns(&self) -> impl Iterator<Item = (&ArrowField, &Box<dyn Arrow2Array>)> + '_ {
+    pub fn fields_and_columns(
+        &self,
+    ) -> impl Iterator<Item = (&ArrowField, &Box<dyn Arrow2Array>)> + '_ {
         self.schema
             .fields
             .iter()
@@ -416,26 +419,26 @@ impl TransportChunk {
     }
 
     #[inline]
-    pub fn all_columns_collected(&self) -> Vec<&dyn Arrow2Array> {
+    pub fn columns(&self) -> Vec<&dyn Arrow2Array> {
         self.data.iter().map(|c| c.as_ref()).collect()
     }
 
     /// Iterates all control columns present in this chunk.
     #[inline]
     pub fn controls(&self) -> impl Iterator<Item = (&ArrowField, &Box<dyn Arrow2Array>)> {
-        self.columns(Self::FIELD_METADATA_VALUE_KIND_CONTROL)
+        self.columns_of_kind(Self::FIELD_METADATA_VALUE_KIND_CONTROL)
     }
 
     /// Iterates all data columns present in this chunk.
     #[inline]
     pub fn components(&self) -> impl Iterator<Item = (&ArrowField, &Box<dyn Arrow2Array>)> {
-        self.columns(Self::FIELD_METADATA_VALUE_KIND_DATA)
+        self.columns_of_kind(Self::FIELD_METADATA_VALUE_KIND_DATA)
     }
 
     /// Iterates all timeline columns present in this chunk.
     #[inline]
     pub fn timelines(&self) -> impl Iterator<Item = (&ArrowField, &Box<dyn Arrow2Array>)> {
-        self.columns(Self::FIELD_METADATA_VALUE_KIND_TIME)
+        self.columns_of_kind(Self::FIELD_METADATA_VALUE_KIND_TIME)
     }
 
     /// How many columns in total? Includes control, time, and component columns.

crates/store/re_chunk_store/src/store.rs

@@ -530,7 +530,12 @@ impl std::fmt::Display for ChunkStore {
         f.write_str(&indent::indent_all_by(4, "chunks: [\n"))?;
         for chunk_id in chunk_id_per_min_row_id.values().flatten() {
             if let Some(chunk) = chunks_per_chunk_id.get(chunk_id) {
-                f.write_str(&indent::indent_all_by(8, format!("{chunk}\n")))?;
+                if let Some(width) = f.width() {
+                    let chunk_width = width.saturating_sub(8);
+                    f.write_str(&indent::indent_all_by(8, format!("{chunk:chunk_width$}\n")))?;
+                } else {
+                    f.write_str(&indent::indent_all_by(8, format!("{chunk}\n")))?;
+                }
             } else {
                 f.write_str(&indent::indent_all_by(8, "<not_found>\n"))?;
             }

crates/store/re_chunk_store/tests/formatting.rs

@@ -42,7 +42,7 @@ fn format_chunk_store() -> anyhow::Result<()> {
             .build()?,
     ))?;
 
-    insta::assert_snapshot!("format_chunk_store", store.to_string());
+    insta::assert_snapshot!("format_chunk_store", format!("{:200}", store));
 
     Ok(())
 }

crates/store/re_chunk_store/tests/snapshots/formatting__format_chunk_store.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/store/re_chunk_store/tests/formatting.rs
 assertion_line: 45
-expression: store.to_string()
+expression: "format!(\"{:200}\", store)"
 snapshot_kind: text
 ---
 ChunkStore {

crates/store/re_dataframe/Cargo.toml

@@ -40,6 +40,7 @@ re_types_core.workspace = true
 anyhow.workspace = true
 arrow.workspace = true
 arrow2.workspace = true
+insta.workspace = true
 itertools.workspace = true
 nohash-hasher.workspace = true
 rayon.workspace = true