Lint fixes

Author: leedqin

misc/python/materialize/mzcompose/__init__.py

@@ -392,6 +392,12 @@ def get_variable_system_parameters(
         VariableSystemParameter(
             "persist_state_update_lease_timeout", "1s", ["0s", "1s", "10s"]
         ),
+        VariableSystemParameter(
+            "arrangement_size_collection_interval", "1h", ["1s", "10s", "1h"]
+        ),
+        VariableSystemParameter(
+            "arrangement_size_retention_period", "7d", ["1m", "1h", "7d"]
+        ),
         VariableSystemParameter(
             "persist_validate_part_bounds_on_read", "false", ["true", "false"]
         ),

misc/python/materialize/parallel_workload/action.py

@@ -1533,6 +1533,16 @@ def __init__(
             "'1s'",
             "'10s'",
         ]
+        self.flags_with_values["arrangement_size_collection_interval"] = [
+            "'1s'",
+            "'10s'",
+            "'1h'",
+        ]
+        self.flags_with_values["arrangement_size_retention_period"] = [
+            "'1m'",
+            "'1h'",
+            "'7d'",
+        ]
         # Note: it's not safe to re-enable this flag after writing with `persist_validate_part_bounds_on_write`,
         # since those new-style parts may fail our old-style validation.
         self.flags_with_values["persist_validate_part_bounds_on_read"] = ["FALSE"]

src/adapter/src/coord.rs

@@ -4279,11 +4279,8 @@ impl Coordinator {
             differential_dataflow::consolidation::consolidate(&mut current_contents);
 
             let cutoff_ts = u128::from(read_ts).saturating_sub(retention_period.as_millis());
-            let expired = arrangement_sizes_expired_retractions(
-                current_contents,
-                cutoff_ts,
-                item_id,
-            );
+            let expired =
+                arrangement_sizes_expired_retractions(current_contents, cutoff_ts, item_id);
 
             // TODO(arrangement-sizes): when the writeable-catalog-server
             // plumbing in https://github.com/MaterializeInc/materialize/pull/35436

src/adapter/src/coord/message_handler.rs

@@ -18,8 +18,8 @@ use maplit::btreemap;
 use mz_catalog::memory::objects::ClusterReplicaProcessStatus;
 use mz_controller::ControllerResponse;
 use mz_controller::clusters::{ClusterEvent, ClusterStatus};
-use mz_ore::instrument;
 use mz_ore::cast::CastFrom;
+use mz_ore::instrument;
 use mz_ore::now::EpochMillis;
 use mz_ore::option::OptionExt;
 use mz_ore::tracing::OpenTelemetryContext;
@@ -429,11 +429,9 @@ impl Coordinator {
             .arrangement_sizes_collection_time_seconds
             .start_timer();
 
-        let live_item_id = self
-            .catalog()
-            .resolve_builtin_storage_collection(
-                &mz_catalog::builtin::MZ_OBJECT_ARRANGEMENT_SIZES_UNIFIED,
-            );
+        let live_item_id = self.catalog().resolve_builtin_storage_collection(
+            &mz_catalog::builtin::MZ_OBJECT_ARRANGEMENT_SIZES_UNIFIED,
+        );
         let live_global_id = self.catalog.get_entry(&live_item_id).latest_global_id();
         let history_item_id = self
             .catalog()
@@ -1117,10 +1115,7 @@ mod arrangement_sizes_hydration_tests {
 
     #[mz_ore::test]
     fn all_non_null_is_hydrated() {
-        let rows = vec![
-            (hydration_row(Some(100)), 1),
-            (hydration_row(Some(200)), 1),
-        ];
+        let rows = vec![(hydration_row(Some(100)), 1), (hydration_row(Some(200)), 1)];
         assert!(arrangement_sizes_all_hydrated(&rows));
     }
 
@@ -1138,10 +1133,7 @@ mod arrangement_sizes_hydration_tests {
     fn retractions_are_ignored() {
         // A -1 row represents stale state that consolidation would remove.
         // We skip it so a retracted null doesn't veto hydration.
-        let rows = vec![
-            (hydration_row(None), -1),
-            (hydration_row(Some(100)), 1),
-        ];
+        let rows = vec![(hydration_row(None), -1), (hydration_row(Some(100)), 1)];
         assert!(arrangement_sizes_all_hydrated(&rows));
     }