You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2023/09/20 22:48:32 UTC
[druid] branch master updated: fix (#15017)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 82e809c8d05 fix (#15017)
82e809c8d05 is described below
commit 82e809c8d05fd670669fb36d806416a6e73835f2
Author: Laksh Singla <la...@gmail.com>
AuthorDate: Thu Sep 21 04:18:26 2023 +0530
fix (#15017)
---
.../apache/druid/query/movingaverage/MovingAverageQueryTest.java | 1 -
.../java/org/apache/druid/server/ClientQuerySegmentWalker.java | 7 +------
.../src/test/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 f5fda5f4e48..522e00a37d7 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 class MovingAverageQueryTest extends InitializedNullHandlingTest
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 c5f858ae163..0e086881362 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.client.cache.CacheConfig;
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 class ClientQuerySegmentWalker implements QuerySegmentWalker
Cache cache,
CacheConfig cacheConfig,
LookupExtractorFactoryContainerProvider lookupManager,
- DruidHttpClientConfig httpClientConfig,
SubqueryCountStatsProvider subqueryStatsProvider
)
{
@@ -140,7 +137,7 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
this.subqueryGuardrailHelper = new SubqueryGuardrailHelper(
lookupManager,
Runtime.getRuntime().maxMemory(),
- httpClientConfig.getNumConnections()
+ serverConfig.getNumThreads()
);
this.subqueryStatsProvider = subqueryStatsProvider;
}
@@ -158,7 +155,6 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
Cache cache,
CacheConfig cacheConfig,
LookupExtractorFactoryContainerProvider lookupManager,
- @Client DruidHttpClientConfig httpClientConfig,
SubqueryCountStatsProvider subqueryStatsProvider
)
{
@@ -174,7 +170,6 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
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 63a751bbb89..fd8839d9cab 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 @@ package org.apache.druid.server;
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 class QueryStackTests
}
},
lookupManager,
- new DruidHttpClientConfig()
- {
- @Override
- public int getNumConnections()
- {
- return 1;
- }
- },
new SubqueryCountStatsProvider()
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org