cleaning DruidProcessingConfig bindings (#14927)

apache · Aug 31, 2023 · dea9d4f · dea9d4f
1 parent 680669f
commit dea9d4f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 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
@@ -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
@@ -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
@@ -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
@@ -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