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

Merge branch 'master' into druid-0.7.x

This commit is contained in:
fjy 2014-08-04 17:01:33 -07:00
parent e4a3108f14 290982433b
commit faf50aa799
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/src/main/java/io/druid/server/coordination/ServerManager.java
View File

@ -390,30 +390,30 @@ public class ServerManager implements QuerySegmentWalker
{ {
SpecificSegmentSpec segmentSpec = new SpecificSegmentSpec(segmentDescriptor); SpecificSegmentSpec segmentSpec = new SpecificSegmentSpec(segmentDescriptor);
return new SpecificSegmentQueryRunner<T>( return new SpecificSegmentQueryRunner<T>(
new MetricsEmittingQueryRunner<T>( new BySegmentQueryRunner<T>(
emitter, adapter.getIdentifier(),
new Function<Query<T>, ServiceMetricEvent.Builder>() adapter.getDataInterval().getStart(),
{ new CachingQueryRunner<T>(
@Override
public ServiceMetricEvent.Builder apply(@Nullable final Query<T> input)
{
return toolChest.makeMetricBuilder(input);
}
},
new BySegmentQueryRunner<T>(
adapter.getIdentifier(), adapter.getIdentifier(),
adapter.getDataInterval().getStart(), segmentDescriptor,
new CachingQueryRunner<T>( objectMapper,
adapter.getIdentifier(), cache,
segmentDescriptor, toolChest,
objectMapper, new MetricsEmittingQueryRunner<T>(
cache, emitter,
toolChest, new Function<Query<T>, ServiceMetricEvent.Builder>()
new ReferenceCountingSegmentQueryRunner<T>(factory, adapter), {
cacheConfig @Override
) public ServiceMetricEvent.Builder apply(@Nullable final Query<T> input)
{
return toolChest.makeMetricBuilder(input);
}
},
new ReferenceCountingSegmentQueryRunner<T>(factory, adapter)
).withWaitMeasuredFromNow(),
cacheConfig
) )
).withWaitMeasuredFromNow(), ),
segmentSpec segmentSpec
); );
} }