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

Merge branch 'druid-0.4.12.x' 

Conflicts:
	client/pom.xml
	common/pom.xml
	examples/pom.xml
	index-common/pom.xml
	indexer/pom.xml
	indexer/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
	merger/pom.xml
	pom.xml
	realtime/pom.xml
	server/pom.xml
	services/pom.xml
This commit is contained in:
Gian Merlino 2013-05-18 17:30:31 -07:00
parent 10bf25a66e d826537672
commit 36b6f5c639
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ public class DruidServer implements Comparable
return segments.get(segmentName);
}
public DruidServer addDataSegment(String segmentName, DataSegment segment)
public DruidServer addDataSegment(String segmentId, DataSegment segment)
{
synchronized (lock) {
String dataSourceName = segment.getDataSource();
@ -138,9 +138,16 @@ public class DruidServer implements Comparable
dataSources.put(dataSourceName, dataSource);
}
dataSource.addSegment(segmentName, segment);
segments.put(segmentName, segment);
dataSource.addSegment(segmentId, segment);
DataSegment shouldNotExist = segments.get(segmentId);
if (shouldNotExist != null) {
log.warn("Asked to add data segment that already exists!? server[%s], segment[%s]", getName(), segmentId);
return this;
}
segments.put(segmentId, segment);
currSize += segment.getSize();
}
return this;
@ -156,13 +163,13 @@ public class DruidServer implements Comparable
return this;
}
public DruidServer removeDataSegment(String segmentName)
public DruidServer removeDataSegment(String segmentId)
{
synchronized (lock) {
DataSegment segment = segments.get(segmentName);
DataSegment segment = segments.get(segmentId);
if (segment == null) {
log.warn("Asked to remove data segment that doesn't exist!? server[%s], segment[%s]", getName(), segmentName);
log.warn("Asked to remove data segment that doesn't exist!? server[%s], segment[%s]", getName(), segmentId);
return this;
}
@ -172,18 +179,20 @@ public class DruidServer implements Comparable
log.warn(
"Asked to remove data segment from dataSource[%s] that doesn't exist, but the segment[%s] exists!?!?!?! wtf? server[%s]",
segment.getDataSource(),
segmentName,
segmentId,
getName()
);
return this;
}
dataSource.removePartition(segmentName);
segments.remove(segmentName);
dataSource.removePartition(segmentId);
segments.remove(segmentId);
currSize -= segment.getSize();
if (dataSource.isEmpty()) {
dataSources.remove(dataSource.getName());
}
currSize -= segment.getSize();
}
return this;