From 82e809c8d05fd670669fb36d806416a6e73835f2 Mon Sep 17 00:00:00 2001
From: Laksh Singla <lakshsingla@gmail.com>
Date: Thu, 21 Sep 2023 04:18:26 +0530
Subject: [PATCH] fix (#15017)

---
 .../query/movingaverage/MovingAverageQueryTest.java      | 1 -
 .../apache/druid/server/ClientQuerySegmentWalker.java    | 7 +------
 .../java/org/apache/druid/server/QueryStackTests.java    | 9 ---------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
index f5fda5f4e483..522e00a37d74 100644
--- a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
+++ b/extensions-contrib/moving-average-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
index c5f858ae1633..0e0868813625 100644
--- 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
index 63a751bbb89b..fd8839d9cab8 100644
--- 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()
     );
   }