Merge branch 'master' into druid-0.7.x

This commit is contained in:
fjy 2014-08-04 17:01:33 -07:00
commit faf50aa799

View File

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