TransportChunk just wraps RecordBatch

crates/store/re_chunk/Cargo.toml

@@ -30,9 +30,6 @@ serde = [
   "re_types_core/serde",
 ]
 
-## Enable conversion to and from arrow-rs types
-arrow = ["arrow2/arrow"]
-
 
 [dependencies]
 

crates/store/re_chunk/src/chunk.rs

@@ -956,13 +956,29 @@ impl Chunk {
         }
     }
 
-    /// Unconditionally inserts an [`Arrow2ListArray`] as a component column.
+    /// Unconditionally inserts an [`ArrowListArray`] as a component column.
     ///
     /// Removes and replaces the column if it already exists.
     ///
     /// This will fail if the end result is malformed in any way -- see [`Self::sanity_check`].
     #[inline]
     pub fn add_component(
+        &mut self,
+        component_desc: ComponentDescriptor,
+        list_array: ArrowListArray,
+    ) -> ChunkResult<()> {
+        self.components
+            .insert_descriptor(component_desc, list_array);
+        self.sanity_check()
+    }
+
+    /// Unconditionally inserts an [`Arrow2ListArray`] as a component column.
+    ///
+    /// Removes and replaces the column if it already exists.
+    ///
+    /// This will fail if the end result is malformed in any way -- see [`Self::sanity_check`].
+    #[inline]
+    pub fn add_component_arrow2(
         &mut self,
         component_desc: ComponentDescriptor,
         list_array: Arrow2ListArray<i32>,

crates/store/re_chunk/src/concat_record_batches.rs

@@ -1,17 +1,12 @@
-use crate::TransportChunk;
-
+use arrow::array::RecordBatch;
 use arrow::datatypes::Schema as ArrowSchema;
-use arrow2::chunk::Chunk as Arrow2Chunk;
 
-/// Concatenate multiple [`TransportChunk`]s into one.
-///
-/// This is a temporary method that we use while waiting to migrate towards `arrow-rs`.
-/// * `arrow2` doesn't have a `RecordBatch` type, therefore we emulate that using our `TransportChunk`s.
-/// * `arrow-rs` does have one, and it natively supports concatenation.
+/// Concatenate multiple [`RecordBatch`]s into one.
+// TODO: make a member of `RecordBatch` instead
 pub fn concatenate_record_batches(
     schema: impl Into<ArrowSchema>,
-    batches: &[TransportChunk],
-) -> anyhow::Result<TransportChunk> {
+    batches: &[RecordBatch],
+) -> anyhow::Result<RecordBatch> {
     let schema: ArrowSchema = schema.into();
     anyhow::ensure!(
         batches
@@ -20,21 +15,8 @@ pub fn concatenate_record_batches(
         "concatenate_record_batches: all batches must have the same schema"
     );
 
-    let mut output_columns = Vec::new();
-
-    if !batches.is_empty() {
-        for (i, _field) in schema.fields.iter().enumerate() {
-            let arrays: Option<Vec<_>> = batches.iter().map(|batch| batch.column(i)).collect();
-            let arrays = arrays.ok_or_else(|| {
-                anyhow::anyhow!("concatenate_record_batches: all batches must have the same schema")
-            })?;
-            let array = re_arrow_util::arrow2_util::concat_arrays(&arrays)?;
-            output_columns.push(array);
-        }
-    }
+    // TODO: is_sorted is probably false now!
 
-    Ok(TransportChunk::new(
-        schema,
-        Arrow2Chunk::new(output_columns),
-    ))
+    let record_batch = arrow::compute::concat_batches(&schema.into(), batches)?;
+    Ok(record_batch)
 }

crates/store/re_chunk/src/lib.rs

@@ -21,9 +21,6 @@ mod transport;
 #[cfg(not(target_arch = "wasm32"))]
 mod batcher;
 
-#[cfg(feature = "arrow")]
-mod arrow;
-
 pub use self::builder::{ChunkBuilder, TimeColumnBuilder};
 pub use self::chunk::{
     Chunk, ChunkComponents, ChunkError, ChunkResult, TimeColumn, TimeColumnError,