From 984cd5ce705b04a912a6c5f97a5eef2a0d8f8083 Mon Sep 17 00:00:00 2001
From: Robert Escriva <robert@trychroma.com>
Date: Mon, 27 Apr 2026 12:57:38 -0700
Subject: [PATCH] chore:  fix merge conflict in main

Two competing PRs for GC landed at the same time.
- One adds a regions_and_topologies field.
- One adds tests unwaware of that field.
The merge doesn't make stuff build so main broke.
---
 rust/garbage_collector/src/garbage_collector_component.rs      | 1 +
 .../garbage_collector/src/garbage_collector_orchestrator_v2.rs | 1 +
 rust/garbage_collector/src/lib.rs                              | 2 ++
 rust/garbage_collector/src/operators/delete_unused_logs.rs     | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/rust/garbage_collector/src/garbage_collector_component.rs b/rust/garbage_collector/src/garbage_collector_component.rs
index 6648402c4e6..1d4a5fb8836 100644
--- a/rust/garbage_collector/src/garbage_collector_component.rs
+++ b/rust/garbage_collector/src/garbage_collector_component.rs
@@ -864,6 +864,7 @@ mod tests {
             sysdb_client,
             storage.clone(),
             Log::InMemory(InMemoryLog::new()),
+            None,
             assignment_policy,
             RootManager::new(storage, Box::new(NopCache)),
         )
diff --git a/rust/garbage_collector/src/garbage_collector_orchestrator_v2.rs b/rust/garbage_collector/src/garbage_collector_orchestrator_v2.rs
index 2a2c0c139c4..63baaed373a 100644
--- a/rust/garbage_collector/src/garbage_collector_orchestrator_v2.rs
+++ b/rust/garbage_collector/src/garbage_collector_orchestrator_v2.rs
@@ -1483,6 +1483,7 @@ mod tests {
             system,
             storage,
             Log::InMemory(InMemoryLog::new()),
+            None,
             root_manager,
             crate::types::CleanupMode::DeleteV2,
             1,
diff --git a/rust/garbage_collector/src/lib.rs b/rust/garbage_collector/src/lib.rs
index 15550130555..5305f5d3eff 100644
--- a/rust/garbage_collector/src/lib.rs
+++ b/rust/garbage_collector/src/lib.rs
@@ -240,6 +240,7 @@ mod tests {
             SysDb::Test(TestSysDb::new()),
             storage.clone(),
             Log::InMemory(InMemoryLog::new()),
+            None,
             Box::new(RendezvousHashingAssignmentPolicy::default()),
             RootManager::new(storage, Box::new(NopCache)),
         );
@@ -295,6 +296,7 @@ mod tests {
             sysdb,
             storage.clone(),
             Log::InMemory(InMemoryLog::new()),
+            None,
             Box::new(RendezvousHashingAssignmentPolicy::default()),
             RootManager::new(storage, Box::new(NopCache)),
         );
diff --git a/rust/garbage_collector/src/operators/delete_unused_logs.rs b/rust/garbage_collector/src/operators/delete_unused_logs.rs
index 3e45730de97..bbb70c33d82 100644
--- a/rust/garbage_collector/src/operators/delete_unused_logs.rs
+++ b/rust/garbage_collector/src/operators/delete_unused_logs.rs
@@ -546,6 +546,7 @@ mod tests {
             mode: CleanupMode::DeleteV2,
             storage: storage.clone(),
             logs: Log::InMemory(InMemoryLog::new()),
+            regions_and_topologies: None,
             enable_dangerous_option_to_ignore_min_versions_for_wal3: false,
         }
         .run(&DeleteUnusedLogsInput {
@@ -588,6 +589,7 @@ mod tests {
             mode: CleanupMode::DryRunV2,
             storage: storage.clone(),
             logs: Log::InMemory(InMemoryLog::new()),
+            regions_and_topologies: None,
             enable_dangerous_option_to_ignore_min_versions_for_wal3: false,
         }
         .run(&DeleteUnusedLogsInput {
@@ -620,6 +622,7 @@ mod tests {
             mode: CleanupMode::DeleteV2,
             storage: storage.clone(),
             logs: Log::InMemory(InMemoryLog::new()),
+            regions_and_topologies: None,
             enable_dangerous_option_to_ignore_min_versions_for_wal3: false,
         }
         .run(&DeleteUnusedLogsInput {