Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix (#15017)

This commit is contained in:
Laksh Singla 2023-09-21 04:18:26 +05:30 committed by GitHub
parent 08cf290da2
commit 82e809c8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
View File

@ -389,7 +389,6 @@ public class MovingAverageQueryTest extends InitializedNullHandlingTest
null, null,
new CacheConfig(), new CacheConfig(),
null, null,
httpClientConfig,
new SubqueryCountStatsProvider() new SubqueryCountStatsProvider()
); );

7
server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
View File

@ -31,8 +31,6 @@ import org.apache.druid.client.cache.CacheConfig;
import org.apache.druid.error.DruidException; import org.apache.druid.error.DruidException;
import org.apache.druid.frame.allocation.ArenaMemoryAllocatorFactory; import org.apache.druid.frame.allocation.ArenaMemoryAllocatorFactory;
import org.apache.druid.frame.write.UnsupportedColumnTypeException; 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.ISE;
import org.apache.druid.java.util.common.Pair; import org.apache.druid.java.util.common.Pair;
import org.apache.druid.java.util.common.guava.Sequence; import org.apache.druid.java.util.common.guava.Sequence;
@ -123,7 +121,6 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
Cache cache, Cache cache,
CacheConfig cacheConfig, CacheConfig cacheConfig,
LookupExtractorFactoryContainerProvider lookupManager, LookupExtractorFactoryContainerProvider lookupManager,
DruidHttpClientConfig httpClientConfig,
SubqueryCountStatsProvider subqueryStatsProvider SubqueryCountStatsProvider subqueryStatsProvider
) )
{ {
@ -140,7 +137,7 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
this.subqueryGuardrailHelper = new SubqueryGuardrailHelper( this.subqueryGuardrailHelper = new SubqueryGuardrailHelper(
lookupManager, lookupManager,
Runtime.getRuntime().maxMemory(), Runtime.getRuntime().maxMemory(),
httpClientConfig.getNumConnections() serverConfig.getNumThreads()
); );
this.subqueryStatsProvider = subqueryStatsProvider; this.subqueryStatsProvider = subqueryStatsProvider;
} }
@ -158,7 +155,6 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
Cache cache, Cache cache,
CacheConfig cacheConfig, CacheConfig cacheConfig,
LookupExtractorFactoryContainerProvider lookupManager, LookupExtractorFactoryContainerProvider lookupManager,
@Client DruidHttpClientConfig httpClientConfig,
SubqueryCountStatsProvider subqueryStatsProvider SubqueryCountStatsProvider subqueryStatsProvider
) )
{ {
@ -174,7 +170,6 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker
cache, cache,
cacheConfig, cacheConfig,
lookupManager, lookupManager,
httpClientConfig,
subqueryStatsProvider subqueryStatsProvider
); );
} }

9
server/src/test/java/org/apache/druid/server/QueryStackTests.java
View File

@ -22,7 +22,6 @@ package org.apache.druid.server;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.apache.druid.client.cache.CacheConfig; 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.common.io.Closer;
import org.apache.druid.java.util.emitter.service.ServiceEmitter; import org.apache.druid.java.util.emitter.service.ServiceEmitter;
import org.apache.druid.query.BrokerParallelMergeConfig; import org.apache.druid.query.BrokerParallelMergeConfig;
@ -166,14 +165,6 @@ public class QueryStackTests
} }
}, },
lookupManager, lookupManager,
new DruidHttpClientConfig()
{
@Override
public int getNumConnections()
{
return 1;
}
},
new SubqueryCountStatsProvider() new SubqueryCountStatsProvider()
); );
} }