honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cat API: Add h parameter to apis, allowing to return columns and descriptions for them 

closes #4262
This commit is contained in:
Shay Banon 2013-11-26 22:14:03 +01:00
parent 2a456e5716
commit f40959cc30
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/common/Table.java
View File

@ -92,7 +92,7 @@ public class Table {
// get the attributes of the header cell we are going to add
mAttr.putAll(headers.get(currentCells.size()).attr);
}
String[] sAttrs = Strings.split(attributes, ";");
String[] sAttrs = Strings.splitStringToArray(attributes, ';');
for (String sAttr : sAttrs) {
if (sAttr.length() == 0) {
continue;

6
src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java
View File

@ -91,9 +91,9 @@ public class RestCountAction extends BaseRestHandler {
Table table = new Table();
table.startHeaders();
table.addCell("time(ms)");
table.addCell("timestamp");
table.addCell("count");
table.addCell("time(ms)", "desc:time, in milliseconds since epoch UTC, that the count was executed");
table.addCell("timestamp", "desc:time that the count was executed");
table.addCell("count", "desc:the document count");
table.endHeaders();
long time = System.currentTimeMillis();

32
src/main/java/org/elasticsearch/rest/action/support/RestTable.java
View File

@ -67,6 +67,20 @@ public class RestTable {
public static RestResponse buildTextPlainResponse(Table table, RestRequest request, RestChannel channel) {
boolean verbose = request.paramAsBoolean("v", false);
boolean help = request.paramAsBoolean("h", false);
if (help) {
int[] width = buildHelpWidths(table, request, verbose);
StringBuilder out = new StringBuilder();
for (Table.Cell cell : table.getHeaders()) {
// need to do left-align always, so create new cells
pad(new Table.Cell(cell.value), width[0], request, out);
out.append(" ");
pad(new Table.Cell(cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available"), width[1], request, out);
out.append("\n");
}
return new StringRestResponse(RestStatus.OK, out.toString());
}
int[] width = buildWidths(table, request, verbose);
Set<String> displayHeaders = buildDisplayHeaders(table, request);
@ -113,6 +127,24 @@ public class RestTable {
return display;
}
private static int[] buildHelpWidths(Table table, RestRequest request, boolean verbose) {
int[] width = new int[2];
for (Table.Cell cell : table.getHeaders()) {
String v = renderValue(request, cell.value);
int vWidth = v == null ? 0 : v.length();
if (width[0] < vWidth) {
width[0] = vWidth;
}
v = renderValue(request, cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available");
vWidth = v == null ? 0 : v.length();
if (width[1] < vWidth) {
width[1] = vWidth;
}
}
return width;
}
private static int[] buildWidths(Table table, RestRequest request, boolean verbose) {
int[] width = new int[table.getHeaders().size()];