From f6e7724d19444cedc550f44771113a8948279e8b Mon Sep 17 00:00:00 2001
From: Marko Mikulicic <mkm@influxdata.com>
Date: Fri, 27 Jan 2023 17:59:24 +0100
Subject: [PATCH] fix(compactor2): Update other locations of the
 TRANSITION_SHARD_INDEX (#6736)

---
 compactor2/src/test_util.rs | 2 +-
 ingest_replica/src/lib.rs   | 2 +-
 ioxd_compactor2/src/lib.rs  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compactor2/src/test_util.rs b/compactor2/src/test_util.rs
index d3884910de..5f147b9be8 100644
--- a/compactor2/src/test_util.rs
+++ b/compactor2/src/test_util.rs
@@ -259,7 +259,7 @@ impl SkippedCompactionBuilder {
     }
 }
 
-const SHARD_INDEX: i32 = 1;
+const SHARD_INDEX: i32 = 1234;
 const PARTITION_THRESHOLD: Duration = Duration::from_secs(10 * 60); // 10min
 const MAX_DESIRE_FILE_SIZE: u64 = 100 * 1024;
 const PERCENTAGE_MAX_FILE_SIZE: u16 = 5;
diff --git a/ingest_replica/src/lib.rs b/ingest_replica/src/lib.rs
index c13837ed3f..8103157c63 100644
--- a/ingest_replica/src/lib.rs
+++ b/ingest_replica/src/lib.rs
@@ -54,7 +54,7 @@ pub enum BufferError {
 /// During the testing of ingest replica, the catalog will require a ShardIndex for
 /// various operations. This is a const value for these occasions. Look up the ShardId for this
 /// ShardIndex when needed.
-const TRANSITION_SHARD_INDEX: ShardIndex = ShardIndex::new(1);
+const TRANSITION_SHARD_INDEX: ShardIndex = ShardIndex::new(1234);
 
 /// Acquire opaque handles to the IngestReplica RPC service implementations.
 ///
diff --git a/ioxd_compactor2/src/lib.rs b/ioxd_compactor2/src/lib.rs
index e2a66c0b7a..cbe05ba171 100644
--- a/ioxd_compactor2/src/lib.rs
+++ b/ioxd_compactor2/src/lib.rs
@@ -27,7 +27,7 @@ use trace::TraceCollector;
 
 // There is only one shard with index 1
 const TOPIC: &str = "iox-shared";
-const SHARD_INDEX: i32 = 1;
+const TRANSITION_SHARD_INDEX: i32 = 1234; // see ingester2 crate
 
 pub struct Compactor2ServerType {
     compactor: Compactor2,
@@ -142,7 +142,7 @@ pub async fn create_compactor2_server_type(
         Arc::clone(&catalog),
         backoff_config.clone(),
         TOPIC.to_string(),
-        SHARD_INDEX,
+        TRANSITION_SHARD_INDEX,
     )
     .await;
     let compactor = Compactor2::start(Config {