mirror of https://github.com/apache/druid.git
more endpoint cleanup
This commit is contained in:
parent
676671e575
commit
c5fbb67d94
|
@ -35,6 +35,7 @@ import io.druid.client.InventoryView;
|
||||||
import io.druid.client.indexing.IndexingServiceClient;
|
import io.druid.client.indexing.IndexingServiceClient;
|
||||||
import io.druid.db.DatabaseSegmentManager;
|
import io.druid.db.DatabaseSegmentManager;
|
||||||
import io.druid.timeline.DataSegment;
|
import io.druid.timeline.DataSegment;
|
||||||
|
import org.joda.time.DateTime;
|
||||||
import org.joda.time.Interval;
|
import org.joda.time.Interval;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
@ -131,7 +132,8 @@ public class DatasourcesResource
|
||||||
@Path("/{dataSourceName}")
|
@Path("/{dataSourceName}")
|
||||||
@Produces("application/json")
|
@Produces("application/json")
|
||||||
public Response getTheDataSource(
|
public Response getTheDataSource(
|
||||||
@PathParam("dataSourceName") final String dataSourceName
|
@PathParam("dataSourceName") final String dataSourceName,
|
||||||
|
@QueryParam("full") final String full
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
DruidDataSource dataSource = getDataSource(dataSourceName.toLowerCase());
|
DruidDataSource dataSource = getDataSource(dataSourceName.toLowerCase());
|
||||||
|
@ -139,9 +141,60 @@ public class DatasourcesResource
|
||||||
return Response.noContent().build();
|
return Response.noContent().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (full != null) {
|
||||||
return Response.ok(dataSource).build();
|
return Response.ok(dataSource).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Map<String, Object> tiers = Maps.newHashMap();
|
||||||
|
Map<String, Object> segments = Maps.newHashMap();
|
||||||
|
Map<String, Map<String, Object>> retVal = ImmutableMap.of(
|
||||||
|
"tiers", tiers,
|
||||||
|
"segments", segments
|
||||||
|
);
|
||||||
|
|
||||||
|
int totalSegmentCount = 0;
|
||||||
|
long totalSegmentSize = 0;
|
||||||
|
long minTime = Long.MAX_VALUE;
|
||||||
|
long maxTime = Long.MIN_VALUE;
|
||||||
|
for (DruidServer druidServer : serverInventoryView.getInventory()) {
|
||||||
|
DruidDataSource druidDataSource = druidServer.getDataSource(dataSourceName);
|
||||||
|
|
||||||
|
long dataSourceSegmentSize = 0;
|
||||||
|
for (DataSegment dataSegment : druidDataSource.getSegments()) {
|
||||||
|
dataSourceSegmentSize += dataSegment.getSize();
|
||||||
|
if (dataSegment.getInterval().getStartMillis() < minTime) {
|
||||||
|
minTime = dataSegment.getInterval().getStartMillis();
|
||||||
|
}
|
||||||
|
if (dataSegment.getInterval().getEndMillis() > maxTime) {
|
||||||
|
maxTime = dataSegment.getInterval().getEndMillis();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// segment stats
|
||||||
|
totalSegmentCount += druidDataSource.getSegments().size();
|
||||||
|
totalSegmentSize += dataSourceSegmentSize;
|
||||||
|
|
||||||
|
// tier stats
|
||||||
|
Map<String, Object> tierStats = (Map) tiers.get(druidServer.getTier());
|
||||||
|
if (tierStats == null) {
|
||||||
|
tierStats = Maps.newHashMap();
|
||||||
|
tiers.put(druidServer.getTier(), tierStats);
|
||||||
|
}
|
||||||
|
int segmentCount = MapUtils.getInt(tierStats, "segmentCount", 0);
|
||||||
|
tierStats.put("segmentCount", segmentCount + druidDataSource.getSegments().size());
|
||||||
|
|
||||||
|
long segmentSize = MapUtils.getLong(tierStats, "size", 0L);
|
||||||
|
tierStats.put("size", segmentSize + dataSourceSegmentSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
segments.put("count", totalSegmentCount);
|
||||||
|
segments.put("size", totalSegmentSize);
|
||||||
|
segments.put("minTime", new DateTime(minTime));
|
||||||
|
segments.put("maxTime", new DateTime(maxTime));
|
||||||
|
|
||||||
|
return Response.ok(retVal).build();
|
||||||
|
}
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@Path("/{dataSourceName}")
|
@Path("/{dataSourceName}")
|
||||||
@Consumes("application/json")
|
@Consumes("application/json")
|
||||||
|
@ -418,7 +471,7 @@ public class DatasourcesResource
|
||||||
{
|
{
|
||||||
Set<String> retVal = Sets.newHashSet();
|
Set<String> retVal = Sets.newHashSet();
|
||||||
for (DruidServer druidServer : serverInventoryView.getInventory()) {
|
for (DruidServer druidServer : serverInventoryView.getInventory()) {
|
||||||
if(druidServer.getDataSource(dataSourceName) != null) {
|
if (druidServer.getDataSource(dataSourceName) != null) {
|
||||||
retVal.add(druidServer.getTier());
|
retVal.add(druidServer.getTier());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue