fix (#15017)

apache · Sep 20, 2023 · 82e809c · 82e809c
1 parent 08cf290
commit 82e809c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/...rage-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java b/...rage-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
@@ -389,7 +389,6 @@ public void emit(Event event)
         null,
         new CacheConfig(),
         null,
-        httpClientConfig,
         new SubqueryCountStatsProvider()
     );
 

diff --git a/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
@@ -31,8 +31,6 @@
 import org.apache.druid.error.DruidException;
 import org.apache.druid.frame.allocation.ArenaMemoryAllocatorFactory;
 import org.apache.druid.frame.write.UnsupportedColumnTypeException;
-import org.apache.druid.guice.annotations.Client;
-import org.apache.druid.guice.http.DruidHttpClientConfig;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Pair;
 import org.apache.druid.java.util.common.guava.Sequence;
@@ -123,7 +121,6 @@ public ClientQuerySegmentWalker(
       Cache cache,
       CacheConfig cacheConfig,
       LookupExtractorFactoryContainerProvider lookupManager,
-      DruidHttpClientConfig httpClientConfig,
       SubqueryCountStatsProvider subqueryStatsProvider
   )
   {
@@ -140,7 +137,7 @@ public ClientQuerySegmentWalker(
     this.subqueryGuardrailHelper = new SubqueryGuardrailHelper(
         lookupManager,
         Runtime.getRuntime().maxMemory(),
-        httpClientConfig.getNumConnections()
+        serverConfig.getNumThreads()
     );
     this.subqueryStatsProvider = subqueryStatsProvider;
   }
@@ -158,7 +155,6 @@ public ClientQuerySegmentWalker(
       Cache cache,
       CacheConfig cacheConfig,
       LookupExtractorFactoryContainerProvider lookupManager,
-      @Client DruidHttpClientConfig httpClientConfig,
       SubqueryCountStatsProvider subqueryStatsProvider
   )
   {
@@ -174,7 +170,6 @@ public ClientQuerySegmentWalker(
         cache,
         cacheConfig,
         lookupManager,
-        httpClientConfig,
         subqueryStatsProvider
     );
   }

diff --git a/server/src/test/java/org/apache/druid/server/QueryStackTests.java b/server/src/test/java/org/apache/druid/server/QueryStackTests.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import org.apache.druid.client.cache.CacheConfig;
-import org.apache.druid.guice.http.DruidHttpClientConfig;
 import org.apache.druid.java.util.common.io.Closer;
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;
 import org.apache.druid.query.BrokerParallelMergeConfig;
@@ -166,14 +165,6 @@ public boolean isUseResultLevelCache()
           }
         },
         lookupManager,
-        new DruidHttpClientConfig()
-        {
-          @Override
-          public int getNumConnections()
-          {
-            return 1;
-          }
-        },
         new SubqueryCountStatsProvider()
     );
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -389,7 +389,6 @@ public void emit(Event event) @@
             null,
             new CacheConfig(),
             null,
-            httpClientConfig,
             new SubqueryCountStatsProvider()
         );
@@ Expand Down @@