Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-20 00:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

sorted db datasources for rules; smaller time boundary range

Browse Source
This commit is contained in:
Fangjin Yang 2012-12-18 16:16:03 -08:00
parent 090a5a105d
commit 00ecf9d028
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java
View File

@ -44,7 +44,7 @@ public class TimeBoundaryQuery extends BaseQuery<Result<TimeBoundaryResultValue>
{ {
public static final Interval MY_Y2K_INTERVAL = new Interval( public static final Interval MY_Y2K_INTERVAL = new Interval(
new DateTime("0000-01-01"), new DateTime("0000-01-01"),
new DateTime("9000-01-01") new DateTime("3000-01-01")
); );
public static final String MAX_TIME = "maxTime"; public static final String MAX_TIME = "maxTime";
public static final String MIN_TIME = "minTime"; public static final String MIN_TIME = "minTime";

10
server/src/main/java/com/metamx/druid/http/InfoResource.java
View File

@ -33,7 +33,6 @@ import com.metamx.druid.client.ServerInventoryManager;
import com.metamx.druid.coordination.DruidClusterInfo; import com.metamx.druid.coordination.DruidClusterInfo;
import com.metamx.druid.db.DatabaseRuleManager; import com.metamx.druid.db.DatabaseRuleManager;
import com.metamx.druid.db.DatabaseSegmentManager; import com.metamx.druid.db.DatabaseSegmentManager;
import com.metamx.druid.jackson.DefaultObjectMapper;
import com.metamx.druid.master.rules.Rule; import com.metamx.druid.master.rules.Rule;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -47,6 +46,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam; import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -556,7 +556,7 @@ public class InfoResource
return builder.entity(databaseSegmentManager.getInventory()).build(); return builder.entity(databaseSegmentManager.getInventory()).build();
} }
return builder.entity( List<String> dataSourceNames = Lists.newArrayList(
Iterables.transform( Iterables.transform(
databaseSegmentManager.getInventory(), databaseSegmentManager.getInventory(),
new Function<DruidDataSource, String>() new Function<DruidDataSource, String>()
@ -568,7 +568,11 @@ public class InfoResource
} }
} }
) )
).build(); );
Collections.sort(dataSourceNames);
return builder.entity(dataSourceNames).build();
} }
@GET @GET