Columnar in logging dataflows

src/compute-types/Cargo.toml

@@ -10,6 +10,7 @@ publish = false
 workspace = true
 
 [dependencies]
+columnar = "0.2.2"
 columnation = "0.1.0"
 differential-dataflow = "0.13.3"
 itertools = "0.12.1"

src/compute-types/src/plan.rs

@@ -14,6 +14,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::num::NonZeroU64;
 
+use columnar::Columnar;
 use mz_expr::{
     CollectionPlan, EvalError, Id, LetRecLimit, LocalId, MapFilterProject, MirScalarExpr,
     OptimizedMirRelationExpr, TableFunc,
@@ -161,14 +162,12 @@ impl AvailableCollections {
 }
 
 /// An identifier for an LIR node.
-///
-/// LirIds start at 1, not 0, which let's us get a better struct packing in `ComputeEvent::LirMapping`.
-#[derive(Clone, Copy, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct LirId(NonZeroU64);
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize, Columnar)]
+pub struct LirId(u64);
 
 impl LirId {
     fn as_u64(&self) -> u64 {
-        self.0.into()
+        self.0
     }
 }
 
@@ -186,11 +185,11 @@ impl std::fmt::Display for LirId {
 
 impl RustType<u64> for LirId {
     fn into_proto(&self) -> u64 {
-        u64::from(self.0)
+        self.0
     }
 
     fn from_proto(proto: u64) -> Result<Self, mz_proto::TryFromProtoError> {
-        Ok(Self(proto.try_into()?))
+        Ok(Self(proto))
     }
 }
 
@@ -513,7 +512,7 @@ impl Arbitrary for LirId {
     type Parameters = ();
 
     fn arbitrary_with(_: Self::Parameters) -> Self::Strategy {
-        let lir_id = NonZeroU64::arbitrary();
+        let lir_id = u64::arbitrary();
         lir_id.prop_map(LirId).boxed()
     }
 }
@@ -1132,16 +1131,6 @@ mod tests {
 
     use super::*;
 
-    #[mz_ore::test]
-    fn test_option_lirid_fits_in_usize() {
-        let option_lirid_size = std::mem::size_of::<Option<LirId>>();
-        let usize_size = std::mem::size_of::<usize>();
-        assert!(
-            option_lirid_size <= usize_size,
-            "Option<LirId> (size {option_lirid_size}) should fit in usize (size {usize_size})"
-        );
-    }
-
     proptest! {
         #![proptest_config(ProptestConfig::with_cases(10))]
         #[mz_ore::test]

src/compute-types/src/plan/lowering.rs

@@ -43,7 +43,7 @@ impl Context {
     pub fn new(debug_name: String, features: &OptimizerFeatures) -> Self {
         Self {
             arrangements: Default::default(),
-            next_lir_id: LirId(std::num::NonZero::<u64>::MIN),
+            next_lir_id: LirId(1),
             debug_info: LirDebugInfo {
                 debug_name,
                 id: GlobalId::Transient(0),

src/compute/Cargo.toml

@@ -13,6 +13,7 @@ workspace = true
 anyhow = "1.0.66"
 async-stream = "0.3.3"
 bytesize = "1.1.0"
+columnar = "0.2.2"
 crossbeam-channel = "0.5.8"
 dec = { version = "0.4.8", features = ["serde"] }
 differential-dataflow = "0.13.3"

src/compute/src/compute_state.rs

@@ -597,7 +597,7 @@ impl<'a, A: Allocate + 'static> ActiveComputeState<'a, A> {
 
         // Log the receipt of the peek.
         if let Some(logger) = self.compute_state.compute_logger.as_mut() {
-            logger.log(pending.as_log_event(true));
+            logger.log(&pending.as_log_event(true));
         }
 
         self.process_peek(&mut Antichain::new(), pending);
@@ -891,7 +891,7 @@ impl<'a, A: Allocate + 'static> ActiveComputeState<'a, A> {
 
         // Log responding to the peek request.
         if let Some(logger) = self.compute_state.compute_logger.as_mut() {
-            logger.log(log_event);
+            logger.log(&log_event);
         }
     }
 

src/compute/src/extensions/arrange.rs

@@ -263,10 +263,10 @@ where
         .stream
         .unary(Pipeline, "ArrangementSize", |_cap, info| {
             let address = info.address;
-            logger.log(ComputeEvent::ArrangementHeapSizeOperator(
+            logger.log(&ComputeEvent::ArrangementHeapSizeOperator(
                 ArrangementHeapSizeOperator {
                     operator_id,
-                    address,
+                    address: address.to_vec(),
                 },
             ));
             move |input, output| {
@@ -281,15 +281,15 @@ where
 
                 let size = size.try_into().expect("must fit");
                 if size != old_size {
-                    logger.log(ComputeEvent::ArrangementHeapSize(ArrangementHeapSize {
+                    logger.log(&ComputeEvent::ArrangementHeapSize(ArrangementHeapSize {
                         operator_id,
                         delta_size: size - old_size,
                     }));
                 }
 
                 let capacity = capacity.try_into().expect("must fit");
                 if capacity != old_capacity {
-                    logger.log(ComputeEvent::ArrangementHeapCapacity(
+                    logger.log(&ComputeEvent::ArrangementHeapCapacity(
                         ArrangementHeapCapacity {
                             operator_id,
                             delta_capacity: capacity - old_capacity,
@@ -299,7 +299,7 @@ where
 
                 let allocations = allocations.try_into().expect("must fit");
                 if allocations != old_allocations {
-                    logger.log(ComputeEvent::ArrangementHeapAllocations(
+                    logger.log(&ComputeEvent::ArrangementHeapAllocations(
                         ArrangementHeapAllocations {
                             operator_id,
                             delta_allocations: allocations - old_allocations,