Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup the maximum concurrent queries in Druid used for calculation in ClientQuerySegmentWalker #15017

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Fixup the maximum concurrent queries in Druid used for calculation in ClientQuerySegmentWalker #15017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...rage-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
View file
Open in desktop
Original file line number Diff 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
7 changes: 1 addition & 6 deletions server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -123,7 +121,6 @@ public ClientQuerySegmentWalker(
Cache cache,
CacheConfig cacheConfig,
LookupExtractorFactoryContainerProvider lookupManager,
DruidHttpClientConfig httpClientConfig,
SubqueryCountStatsProvider subqueryStatsProvider
)
{
Expand All @@ -140,7 +137,7 @@ public ClientQuerySegmentWalker(
this.subqueryGuardrailHelper = new SubqueryGuardrailHelper(
lookupManager,
Runtime.getRuntime().maxMemory(),
httpClientConfig.getNumConnections()
serverConfig.getNumThreads()
);
this.subqueryStatsProvider = subqueryStatsProvider;
}
Expand All @@ -158,7 +155,6 @@ public ClientQuerySegmentWalker(
Cache cache,
CacheConfig cacheConfig,
LookupExtractorFactoryContainerProvider lookupManager,
@Client DruidHttpClientConfig httpClientConfig,
SubqueryCountStatsProvider subqueryStatsProvider
)
{
Expand All @@ -174,7 +170,6 @@ public ClientQuerySegmentWalker(
cache,
cacheConfig,
lookupManager,
httpClientConfig,
subqueryStatsProvider
);
}
Expand Down
9 changes: 0 additions & 9 deletions server/src/test/java/org/apache/druid/server/QueryStackTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -166,14 +165,6 @@ public boolean isUseResultLevelCache()
}
},
lookupManager,
new DruidHttpClientConfig()
{
@Override
public int getNumConnections()
{
return 1;
}
},
new SubqueryCountStatsProvider()
);
}
Expand Down