From dea9d4f1a75dd3681c6a94f86a317d22b1599af3 Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Wed, 30 Aug 2023 22:35:08 -0700
Subject: [PATCH] cleaning DruidProcessingConfig bindings (#14927)

---
 .../java/org/apache/druid/guice/BrokerProcessingModule.java     | 2 --
 .../main/java/org/apache/druid/guice/DruidProcessingModule.java | 2 --
 .../java/org/apache/druid/guice/RouterProcessingModule.java     | 2 --
 .../src/main/java/org/apache/druid/guice/StorageNodeModule.java | 2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/src/main/java/org/apache/druid/guice/BrokerProcessingModule.java b/server/src/main/java/org/apache/druid/guice/BrokerProcessingModule.java
index 77572bae47a5..0fcb4785191e 100644
--- a/server/src/main/java/org/apache/druid/guice/BrokerProcessingModule.java
+++ b/server/src/main/java/org/apache/druid/guice/BrokerProcessingModule.java
@@ -46,7 +46,6 @@
 import org.apache.druid.query.ExecutorServiceMonitor;
 import org.apache.druid.query.ForwardingQueryProcessingPool;
 import org.apache.druid.query.QueryProcessingPool;
-import org.apache.druid.segment.column.ColumnConfig;
 import org.apache.druid.server.metrics.MetricsModule;
 import org.apache.druid.utils.JvmUtils;
 
@@ -70,7 +69,6 @@ public void configure(Binder binder)
   {
     JsonConfigProvider.bind(binder, "druid.processing.merge", BrokerParallelMergeConfig.class);
     JsonConfigProvider.bind(binder, "druid.processing", DruidProcessingConfig.class);
-    binder.bind(ColumnConfig.class).to(DruidProcessingConfig.class);
     MetricsModule.register(binder, ExecutorServiceMonitor.class);
   }
 
diff --git a/server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java b/server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java
index 56a0fd0ede6f..76cc855cd224 100644
--- a/server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java
+++ b/server/src/main/java/org/apache/druid/guice/DruidProcessingModule.java
@@ -46,7 +46,6 @@
 import org.apache.druid.query.MetricsEmittingQueryProcessingPool;
 import org.apache.druid.query.PrioritizedExecutorService;
 import org.apache.druid.query.QueryProcessingPool;
-import org.apache.druid.segment.column.ColumnConfig;
 import org.apache.druid.server.metrics.MetricsModule;
 import org.apache.druid.utils.JvmUtils;
 
@@ -64,7 +63,6 @@ public class DruidProcessingModule implements Module
   public void configure(Binder binder)
   {
     JsonConfigProvider.bind(binder, "druid.processing", DruidProcessingConfig.class);
-    binder.bind(ColumnConfig.class).to(DruidProcessingConfig.class);
     MetricsModule.register(binder, ExecutorServiceMonitor.class);
   }
 
diff --git a/server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java b/server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java
index 3b68289c6dd1..dc68cbb4bffa 100644
--- a/server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java
+++ b/server/src/main/java/org/apache/druid/guice/RouterProcessingModule.java
@@ -34,7 +34,6 @@
 import org.apache.druid.query.ExecutorServiceMonitor;
 import org.apache.druid.query.ForwardingQueryProcessingPool;
 import org.apache.druid.query.QueryProcessingPool;
-import org.apache.druid.segment.column.ColumnConfig;
 import org.apache.druid.server.metrics.MetricsModule;
 
 import java.nio.ByteBuffer;
@@ -54,7 +53,6 @@ public class RouterProcessingModule implements Module
   public void configure(Binder binder)
   {
     JsonConfigProvider.bind(binder, "druid.processing", DruidProcessingConfig.class);
-    binder.bind(ColumnConfig.class).to(DruidProcessingConfig.class);
     MetricsModule.register(binder, ExecutorServiceMonitor.class);
   }
 
diff --git a/server/src/main/java/org/apache/druid/guice/StorageNodeModule.java b/server/src/main/java/org/apache/druid/guice/StorageNodeModule.java
index cc4e0b1e33a4..3ae5d2a3586f 100644
--- a/server/src/main/java/org/apache/druid/guice/StorageNodeModule.java
+++ b/server/src/main/java/org/apache/druid/guice/StorageNodeModule.java
@@ -57,7 +57,7 @@ public void configure(Binder binder)
     JsonConfigProvider.bind(binder, "druid.segmentCache", SegmentLoaderConfig.class);
     bindLocationSelectorStrategy(binder);
     binder.bind(ServerTypeConfig.class).toProvider(Providers.of(null));
-    binder.bind(ColumnConfig.class).to(DruidProcessingConfig.class);
+    binder.bind(ColumnConfig.class).to(DruidProcessingConfig.class).in(LazySingleton.class);
   }
 
   @Provides