undo some

kgyrtkirk · May 16, 2024 · 93892b6 · 93892b6
1 parent b63a80e
commit 93892b6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java b/integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java
@@ -28,7 +28,6 @@
 import org.apache.druid.discovery.DruidNodeDiscovery;
 import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
 import org.apache.druid.discovery.NodeRole;
-import org.apache.druid.discovery.DruidNodeDiscovery.Listener;
 import org.apache.druid.guice.LazySingleton;
 import org.apache.druid.guice.annotations.Json;
 import org.apache.druid.query.QueryRunnerFactoryConglomerate;
@@ -71,6 +70,7 @@ public Properties getProps() {
       localProps.put("druid.zk.service.enabled", "false");
       localProps.put("druid.plaintextPort", "12345");
       localProps.put("druid.host", "localhost");
+      localProps.put("druid.broker.segment.awaitInitializationOnStart","false");
       return localProps;
     }
 

diff --git a/server/src/main/java/org/apache/druid/client/BrokerSegmentWatcherConfig.java b/server/src/main/java/org/apache/druid/client/BrokerSegmentWatcherConfig.java
@@ -40,7 +40,7 @@ public class BrokerSegmentWatcherConfig
   private boolean watchRealtimeTasks = true;
 
   @JsonProperty
-  private boolean awaitInitializationOnStart = false;
+  private boolean awaitInitializationOnStart = true;
 
   public Set<String> getWatchedTiers()
   {

diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/BrokerSegmentMetadataCache.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/BrokerSegmentMetadataCache.java
@@ -21,6 +21,7 @@
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Sets;
+import com.google.inject.Inject;
 import org.apache.druid.client.InternalQueryConfig;
 import org.apache.druid.client.ServerView;
 import org.apache.druid.client.TimelineServerView;
@@ -76,6 +77,7 @@ public class BrokerSegmentMetadataCache extends AbstractSegmentMetadataCache<Phy
   private final BrokerSegmentMetadataCacheConfig config;
   private final CentralizedDatasourceSchemaConfig centralizedDatasourceSchemaConfig;
 
+  @Inject
   public BrokerSegmentMetadataCache(
       final QueryLifecycleFactory queryLifecycleFactory,
       final TimelineServerView serverView,

diff --git a/sql/src/main/java/org/apache/druid/sql/guice/SqlModule.java b/sql/src/main/java/org/apache/druid/sql/guice/SqlModule.java
@@ -77,12 +77,10 @@ public void configure(Binder binder)
       return;
     }
 
-    if(false) {
       PolyBind.optionBinder(binder, Key.get(ViewManager.class))
               .addBinding(NoopViewManager.TYPE)
               .to(NoopViewManager.class)
               .in(LazySingleton.class);
-    }
 
     if(false) {
       PolyBind.createChoiceWithDefault(

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/LookylooModule.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/LookylooModule.java
@@ -45,9 +45,6 @@
  */
 public class LookylooModule implements DruidModule
 {
-  public LookylooModule() {
-    int asd1=1;
-  }
   private static final String LOOKYLOO_INJECTIVE = "lookyloo121";
   private static final String LOOKYLOO_CHAINED = "lookyloo-chain";