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

support aliases for columns in cat API 

use it as an example in nodes for now for some columns, though we need to go over all the columns and properly name them and alias them
This commit is contained in:
Shay Banon 2014-01-03 00:41:26 +01:00
parent a754224751
commit 2a73cf4f82
4 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,11 @@ public class Table {
public final Object value; public final Object value;
public final Map<String, String> attr; public final Map<String, String> attr;
public Cell(Object value, Cell other) {
this.value = value;
this.attr = other.attr;
}
public Cell(Object value) { public Cell(Object value) {
this.value = value; this.value = value;
this.attr = new HashMap<String, String>(); this.attr = new HashMap<String, String>();

4
src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
View File

@ -50,7 +50,9 @@ public abstract class AbstractCatAction extends BaseRestHandler {
// need to do left-align always, so create new cells // need to do left-align always, so create new cells
pad(new Table.Cell(cell.value), width[0], request, out); pad(new Table.Cell(cell.value), width[0], request, out);
out.append(" | "); out.append(" | ");
pad(new Table.Cell(cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available"), width[1], request, out); pad(new Table.Cell(cell.attr.containsKey("alias") ? cell.attr.get("alias") : ""), width[1], request, out);
out.append(" | ");
pad(new Table.Cell(cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available"), width[2], request, out);
out.append("\n"); out.append("\n");
} }
channel.sendResponse(new StringRestResponse(RestStatus.OK, out.toString())); channel.sendResponse(new StringRestResponse(RestStatus.OK, out.toString()));

4
src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
View File

@ -127,8 +127,8 @@ public class RestNodesAction extends AbstractCatAction {
table.addCell("ip", "desc:ip address"); table.addCell("ip", "desc:ip address");
table.addCell("port", "desc:bound transport port"); table.addCell("port", "desc:bound transport port");
table.addCell("version", "default:false;desc:es version"); table.addCell("version", "default:false;alias:v;desc:es version");
table.addCell("build", "default:false;desc:es build hash"); table.addCell("build", "default:false;alias:b;desc:es build hash");
table.addCell("jdk", "default:false;desc:jdk version"); table.addCell("jdk", "default:false;desc:jdk version");
table.addCell("diskAvail", "default:false;text-align:right;desc:available disk space"); table.addCell("diskAvail", "default:false;text-align:right;desc:available disk space");
table.addCell("heapPercent", "text-align:right;desc:used heap ratio"); table.addCell("heapPercent", "text-align:right;desc:used heap ratio");

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

@ -46,13 +46,13 @@ public class RestTable {
public static RestResponse buildXContentBuilder(Table table, RestRequest request, RestChannel channel) throws Exception { public static RestResponse buildXContentBuilder(Table table, RestRequest request, RestChannel channel) throws Exception {
XContentBuilder builder = RestXContentBuilder.restContentBuilder(request); XContentBuilder builder = RestXContentBuilder.restContentBuilder(request);
List<String> displayHeaders = buildDisplayHeaders(table, request); List<DisplayHeader> displayHeaders = buildDisplayHeaders(table, request);
builder.startArray(); builder.startArray();
for (int row = 0; row < table.getRows().size(); row++) { for (int row = 0; row < table.getRows().size(); row++) {
builder.startObject(); builder.startObject();
for (String header : displayHeaders) { for (DisplayHeader header : displayHeaders) {
builder.field(header, renderValue(request, table.getAsMap().get(header).get(row).value)); builder.field(header.display, renderValue(request, table.getAsMap().get(header.name).get(row).value));
} }
builder.endObject(); builder.endObject();
@ -63,27 +63,15 @@ public class RestTable {
public static RestResponse buildTextPlainResponse(Table table, RestRequest request, RestChannel channel) { public static RestResponse buildTextPlainResponse(Table table, RestRequest request, RestChannel channel) {
boolean verbose = request.paramAsBoolean("v", false); 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());
}
List<String> headers = buildDisplayHeaders(table, request); List<DisplayHeader> headers = buildDisplayHeaders(table, request);
int[] width = buildWidths(table, request, verbose, headers); int[] width = buildWidths(table, request, verbose, headers);
StringBuilder out = new StringBuilder(); StringBuilder out = new StringBuilder();
if (verbose) { if (verbose) {
for (int col = 0; col < headers.size(); col++) { for (int col = 0; col < headers.size(); col++) {
pad(table.findHeaderByName(headers.get(col)), width[col], request, out); DisplayHeader header = headers.get(col);
pad(new Table.Cell(header.display, table.findHeaderByName(header.name)), width[col], request, out);
out.append(" "); out.append(" ");
} }
out.append("\n"); out.append("\n");
@ -91,8 +79,8 @@ public class RestTable {
for (int row = 0; row < table.getRows().size(); row++) { for (int row = 0; row < table.getRows().size(); row++) {
for (int col = 0; col < headers.size(); col++) { for (int col = 0; col < headers.size(); col++) {
String header = headers.get(col); DisplayHeader header = headers.get(col);
pad(table.getAsMap().get(header).get(row), width[col], request, out); pad(table.getAsMap().get(header.name).get(row), width[col], request, out);
out.append(" "); out.append(" ");
} }
out.append("\n"); out.append("\n");
@ -101,20 +89,32 @@ public class RestTable {
return new StringRestResponse(RestStatus.OK, out.toString()); return new StringRestResponse(RestStatus.OK, out.toString());
} }
private static List<String> buildDisplayHeaders(Table table, RestRequest request) { private static List<DisplayHeader> buildDisplayHeaders(Table table, RestRequest request) {
String pHeaders = request.param("headers"); String pHeaders = request.param("headers");
List<String> display = new ArrayList<String>(); List<DisplayHeader> display = new ArrayList<DisplayHeader>();
if (pHeaders != null) { if (pHeaders != null) {
for (String possibility : Strings.splitStringByCommaToArray(pHeaders)) { for (String possibility : Strings.splitStringByCommaToArray(pHeaders)) {
if (table.getAsMap().containsKey(possibility)) { if (table.getAsMap().containsKey(possibility)) {
display.add(possibility); display.add(new DisplayHeader(possibility, possibility));
} else {
for (Table.Cell headerCell : table.getHeaders()) {
String aliases = headerCell.attr.get("alias");
if (aliases != null) {
for (String alias : Strings.splitStringByCommaToArray(aliases)) {
if (possibility.equals(alias)) {
display.add(new DisplayHeader(headerCell.value.toString(), alias));
break;
}
}
}
}
} }
} }
} else { } else {
for (Table.Cell cell : table.getHeaders()) { for (Table.Cell cell : table.getHeaders()) {
String d = cell.attr.get("default"); String d = cell.attr.get("default");
if (Booleans.parseBoolean(d, true)) { if (Booleans.parseBoolean(d, true)) {
display.add(cell.value.toString()); display.add(new DisplayHeader(cell.value.toString(), cell.value.toString()));
} }
} }
} }
@ -122,7 +122,7 @@ public class RestTable {
} }
public static int[] buildHelpWidths(Table table, RestRequest request, boolean verbose) { public static int[] buildHelpWidths(Table table, RestRequest request, boolean verbose) {
int[] width = new int[2]; int[] width = new int[3];
for (Table.Cell cell : table.getHeaders()) { for (Table.Cell cell : table.getHeaders()) {
String v = renderValue(request, cell.value); String v = renderValue(request, cell.value);
int vWidth = v == null ? 0 : v.length(); int vWidth = v == null ? 0 : v.length();
@ -130,23 +130,29 @@ public class RestTable {
width[0] = vWidth; width[0] = vWidth;
} }
v = renderValue(request, cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available"); v = renderValue(request, cell.attr.containsKey("alias") ? cell.attr.get("alias") : "");
vWidth = v == null ? 0 : v.length(); vWidth = v == null ? 0 : v.length();
if (width[1] < vWidth) { if (width[1] < vWidth) {
width[1] = vWidth; width[1] = vWidth;
} }
v = renderValue(request, cell.attr.containsKey("desc") ? cell.attr.get("desc") : "not available");
vWidth = v == null ? 0 : v.length();
if (width[2] < vWidth) {
width[2] = vWidth;
}
} }
return width; return width;
} }
private static int[] buildWidths(Table table, RestRequest request, boolean verbose, List<String> headers) { private static int[] buildWidths(Table table, RestRequest request, boolean verbose, List<DisplayHeader> headers) {
int[] width = new int[headers.size()]; int[] width = new int[headers.size()];
int i; int i;
if (verbose) { if (verbose) {
i = 0; i = 0;
for (String hdr : headers) { for (DisplayHeader hdr : headers) {
int vWidth = hdr.length(); int vWidth = hdr.display.length();
if (width[i] < vWidth) { if (width[i] < vWidth) {
width[i] = vWidth; width[i] = vWidth;
} }
@ -155,8 +161,8 @@ public class RestTable {
} }
i = 0; i = 0;
for (String hdr : headers) { for (DisplayHeader hdr : headers) {
for (Table.Cell cell : table.getAsMap().get(hdr)) { for (Table.Cell cell : table.getAsMap().get(hdr.name)) {
String v = renderValue(request, cell.value); String v = renderValue(request, cell.value);
int vWidth = v == null ? 0 : v.length(); int vWidth = v == null ? 0 : v.length();
if (width[i] < vWidth) { if (width[i] < vWidth) {
@ -245,4 +251,14 @@ public class RestTable {
// Add additional built in data points we can render based on request parameters? // Add additional built in data points we can render based on request parameters?
return value.toString(); return value.toString();
} }
static class DisplayHeader {
public final String name;
public final String display;
DisplayHeader(String name, String display) {
this.name = name;
this.display = display;
}
}
} }