Minor

Author: Siddhartha Sahu

doc/developer/design/20240919_dataflow_expiration.md

@@ -106,7 +106,7 @@ More concretely, this feature involves the following changes:
   `replica_expiration = now() + offset`. This value indicates the maximum
   time for which the replica is expected to be running.
   * Existing replicas should be restarted to enable or disable replica
-    expiration for them. 
+    expiration for them.
 * When building a dataflow, compute `dataflow_expiration` as per the logic
   described above. If non-empty, the `dataflow_expiration` is added to the
   dataflow `until` that ensures that any diff beyond this limit is dropped in

src/compute-types/src/dataflows.proto

@@ -48,15 +48,17 @@ message ProtoDataflowDescription {
     sinks.ProtoComputeSinkDesc sink_desc = 2;
   }
 
+  message ProtoRefreshDepIndex {
+    uint64 start = 1;
+    uint64 end = 2;
+  }
+
+  message ProtoRefreshDep {
+    optional ProtoRefreshDepIndex refresh_dep_index = 1;
+    optional mz_repr.refresh_schedule.ProtoRefreshSchedule refresh_schedule = 2;
+  }
+
   message ProtoDataflowExpirationDesc {
-    message ProtoRefreshDepIndex {
-      uint64 start = 1;
-      uint64 end = 2;
-    }
-    message ProtoRefreshDep {
-      optional ProtoRefreshDepIndex refresh_dep_index = 1;
-      optional mz_repr.refresh_schedule.ProtoRefreshSchedule refresh_schedule = 2;
-    }
     optional mz_repr.antichain.ProtoU64Antichain transitive_upper = 1;
     bool is_timeline_epoch_ms = 3;
     repeated ProtoRefreshDep refresh_deps = 4;

src/compute-types/src/dataflows.rs

@@ -26,11 +26,9 @@ use serde::{Deserialize, Serialize};
 use timely::progress::Antichain;
 use timely::Container;
 
-use crate::dataflows::proto_dataflow_description::proto_dataflow_expiration_desc::ProtoRefreshDep;
-use crate::dataflows::proto_dataflow_description::proto_dataflow_expiration_desc::ProtoRefreshDepIndex;
 use crate::dataflows::proto_dataflow_description::{
-    ProtoDataflowExpirationDesc, ProtoIndexExport, ProtoIndexImport, ProtoSinkExport,
-    ProtoSourceImport,
+    ProtoDataflowExpirationDesc, ProtoIndexExport, ProtoIndexImport, ProtoRefreshDep,
+    ProtoRefreshDepIndex, ProtoSinkExport, ProtoSourceImport,
 };
 use crate::plan::flat_plan::FlatPlan;
 use crate::plan::Plan;