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 stop_task

This commit is contained in:
Gian Merlino 2013-03-24 18:24:02 -07:00
parent 3266139774 dcd10e69c7
commit d366eec291
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/java/com/metamx/druid/client/DruidServer.java
View File

@ -24,8 +24,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.metamx.common.logger.Logger; import com.metamx.common.logger.Logger;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -41,7 +39,7 @@ public class DruidServer implements Comparable
private final String name; private final String name;
private final ConcurrentMap<String, DruidDataSource> dataSources; private final ConcurrentMap<String, DruidDataSource> dataSources;
private final Map<String, DataSegment> segments; private final ConcurrentMap<String, DataSegment> segments;
private final String host; private final String host;
private final long maxSize; private final long maxSize;
@ -80,7 +78,7 @@ public class DruidServer implements Comparable
this.tier = tier; this.tier = tier;
this.dataSources = new ConcurrentHashMap<String, DruidDataSource>(); this.dataSources = new ConcurrentHashMap<String, DruidDataSource>();
this.segments = new HashMap<String, DataSegment>(); this.segments = new ConcurrentHashMap<String, DataSegment>();
} }
public String getName() public String getName()
@ -132,7 +130,7 @@ public class DruidServer implements Comparable
@JsonProperty @JsonProperty
public Map<String, DataSegment> getSegments() public Map<String, DataSegment> getSegments()
{ {
return segments; return ImmutableMap.copyOf(segments);
} }
public DataSegment getSegment(String segmentName) public DataSegment getSegment(String segmentName)

2
merger/src/main/java/com/metamx/druid/merger/worker/WorkerTaskMonitor.java
View File

@ -161,7 +161,7 @@ public class WorkerTaskMonitor
private boolean isTaskRunning(final Task task) private boolean isTaskRunning(final Task task)
{ {
for (final Task runningTask : running) { for (final Task runningTask : running) {
if (runningTask.equals(task.getId())) { if (runningTask.getId().equals(task.getId())) {
return true; return true;
} }
} }