From 4dd73a036b8102a6a075e1eaa90538d296c0fcd7 Mon Sep 17 00:00:00 2001
From: wiedld <dlw405@gmail.com>
Date: Mon, 24 Jul 2023 18:28:42 -0700
Subject: [PATCH] refactor(idpe-17789): rename remaining references (in methods
 and report output) to be compaction_job_stream

---
 compactor/src/components/hardcoded.rs | 4 ++--
 compactor/src/components/mod.rs       | 2 +-
 compactor/src/components/report.rs    | 4 ++--
 compactor/src/driver.rs               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compactor/src/components/hardcoded.rs b/compactor/src/components/hardcoded.rs
index f6eb732a51..f829d83fd3 100644
--- a/compactor/src/components/hardcoded.rs
+++ b/compactor/src/components/hardcoded.rs
@@ -96,7 +96,7 @@ pub fn hardcoded_components(config: &Config) -> Arc<Components> {
         make_jobs_source_commit_partition_sink(config, Arc::clone(&scheduler));
 
     Arc::new(Components {
-        partition_stream: make_partition_stream(config, compaction_jobs_source),
+        compaction_job_stream: make_compaction_job_stream(config, compaction_jobs_source),
         partition_info_source: make_partition_info_source(config),
         partition_files_source: make_partition_files_source(config),
         round_info_source: make_round_info_source(config),
@@ -181,7 +181,7 @@ fn make_jobs_source_commit_partition_sink(
     )
 }
 
-fn make_partition_stream(
+fn make_compaction_job_stream(
     config: &Config,
     compaction_jobs_source: Arc<dyn CompactionJobsSource>,
 ) -> Arc<dyn CompactionJobStream> {
diff --git a/compactor/src/components/mod.rs b/compactor/src/components/mod.rs
index cb49640751..abb321ed97 100644
--- a/compactor/src/components/mod.rs
+++ b/compactor/src/components/mod.rs
@@ -47,7 +47,7 @@ pub mod timeout;
 #[derive(Debug, Clone)]
 pub struct Components {
     /// Source of partitions for the compactor to compact
-    pub partition_stream: Arc<dyn CompactionJobStream>,
+    pub compaction_job_stream: Arc<dyn CompactionJobStream>,
     /// Source of information about a partition neededed for compaction
     pub partition_info_source: Arc<dyn PartitionInfoSource>,
     /// Source of files in a partition for compaction
diff --git a/compactor/src/components/report.rs b/compactor/src/components/report.rs
index b790a1c760..9587500cbf 100644
--- a/compactor/src/components/report.rs
+++ b/compactor/src/components/report.rs
@@ -80,7 +80,7 @@ pub fn log_config(config: &Config) {
 pub fn log_components(components: &Components) {
     // use struct unpack so we don't forget any members
     let Components {
-        partition_stream,
+        compaction_job_stream,
         partition_info_source,
         partition_files_source,
         round_info_source,
@@ -100,7 +100,7 @@ pub fn log_components(components: &Components) {
     } = components;
 
     info!(
-        %partition_stream,
+        %compaction_job_stream,
         %partition_info_source,
         %partition_files_source,
         %round_info_source,
diff --git a/compactor/src/driver.rs b/compactor/src/driver.rs
index 89f7669bd6..faef17fccd 100644
--- a/compactor/src/driver.rs
+++ b/compactor/src/driver.rs
@@ -35,13 +35,13 @@ pub async fn compact(
     components: &Arc<Components>,
 ) {
     components
-        .partition_stream
+        .compaction_job_stream
         .stream()
         .map(|job| {
             let components = Arc::clone(components);
 
             // A root span is created for each partition.  Later this can be linked to the
-            // scheduler's span via something passed through partition_stream.
+            // scheduler's span via something passed through compaction_job_stream.
             let root_span: Option<Span> = trace_collector
                 .as_ref()
                 .map(|collector| Span::root("compaction", Arc::clone(collector)));