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

fix more bugs with determining what is assignable and what is not

This commit is contained in:
fjy 2014-02-03 16:45:59 -08:00
parent 46571ddf69
commit 8b398533cb
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/io/druid/client/CachingClusteredClient.java
View File

@ -313,7 +313,7 @@ public class CachingClusteredClient<T> implements QueryRunner<T>
final MultipleSpecificSegmentSpec segmentSpec = new MultipleSpecificSegmentSpec(descriptors); final MultipleSpecificSegmentSpec segmentSpec = new MultipleSpecificSegmentSpec(descriptors);
List<Interval> intervals = segmentSpec.getIntervals(); List<Interval> intervals = segmentSpec.getIntervals();
if (server.isRealtime() || !populateCache || isBySegment) { if (!server.isAssignable() || !populateCache || isBySegment) {
resultSeqToAdd = clientQueryable.run(query.withQuerySegmentSpec(segmentSpec)); resultSeqToAdd = clientQueryable.run(query.withQuerySegmentSpec(segmentSpec));
} else { } else {
resultSeqToAdd = toolChest.mergeSequences( resultSeqToAdd = toolChest.mergeSequences(

5
server/src/main/java/io/druid/client/DruidServer.java
View File

@ -141,11 +141,6 @@ public class DruidServer implements Comparable
return getType().equalsIgnoreCase("historical") || getType().equalsIgnoreCase("bridge"); return getType().equalsIgnoreCase("historical") || getType().equalsIgnoreCase("bridge");
} }
public boolean isRealtime()
{
return getType().equalsIgnoreCase("realtime");
}
public DataSegment getSegment(String segmentName) public DataSegment getSegment(String segmentName)
{ {
return segments.get(segmentName); return segments.get(segmentName);

2
server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
View File

@ -704,7 +704,7 @@ public class RealtimePlumber implements Plumber
return ServerView.CallbackAction.UNREGISTER; return ServerView.CallbackAction.UNREGISTER;
} }
if (server.isRealtime()) { if (!server.isAssignable()) {
return ServerView.CallbackAction.CONTINUE; return ServerView.CallbackAction.CONTINUE;
} }