-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Always display sub plan link in QueryMetricsDetailListResponse, fix l…
…ogic for sub plans in QueryMetricCombiner, include some metric fields in html of BaseQueryMetricSubplanResponse, make BaseQueryMetricSubplanResponse abstract
- Loading branch information
Showing
6 changed files
with
66 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 1 addition & 69 deletions
70
api/src/main/java/datawave/microservice/querymetric/QueryMetricsSubplanResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,15 @@ | ||
| package datawave.microservice.querymetric; | ||
|
|
||
| import datawave.webservice.query.QueryImpl.Parameter; | ||
| import datawave.microservice.querymetric.BaseQueryMetric.PageMetric; | ||
| import datawave.microservice.querymetric.BaseQueryMetric.Prediction; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.commons.text.StringEscapeUtils; | ||
|
|
||
| import javax.xml.bind.annotation.XmlAccessOrder; | ||
| import javax.xml.bind.annotation.XmlAccessType; | ||
| import javax.xml.bind.annotation.XmlAccessorOrder; | ||
| import javax.xml.bind.annotation.XmlAccessorType; | ||
| import javax.xml.bind.annotation.XmlRootElement; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.Date; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.TreeMap; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @XmlRootElement(name = "QueryMetricListResponse") | ||
| @XmlAccessorType(XmlAccessType.NONE) | ||
| @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL) | ||
| public class QueryMetricsSubplanResponse extends QueryMetricListResponse { | ||
| public class QueryMetricsSubplanResponse extends BaseQueryMetricSubplanResponse<QueryMetric> { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final String TITLE = "Query Subplans"; | ||
|
|
||
| @Override | ||
| public String getTitle() { | ||
| return TITLE; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMainContent() { | ||
| StringBuilder builder = new StringBuilder(), pageTimesBuilder = new StringBuilder(); | ||
|
|
||
| builder.append("<table>\n"); | ||
| builder.append("<tr>"); | ||
| builder.append("<th>Subplan(s)</th>"); | ||
|
|
||
| pageTimesBuilder.append("<table>\n"); | ||
|
|
||
| builder.append(pageTimesBuilder); | ||
|
|
||
| TreeMap<Date,QueryMetric> metricMap = new TreeMap<>(Collections.reverseOrder()); | ||
|
|
||
| for (QueryMetric metric : this.getResult()) { | ||
| metricMap.put(metric.getCreateDate(), metric); | ||
| } | ||
|
|
||
| int x = 0; | ||
| for (QueryMetric metric : metricMap.values()) { | ||
| // highlight alternating rows | ||
| if (x % 2 == 0) { | ||
| builder.append("<tr class=\"highlight\">\n"); | ||
| } else { | ||
| builder.append("<tr>\n"); | ||
| } | ||
| x++; | ||
| if (metric.getSubPlans() != null && !metric.getSubPlans().isEmpty()) { | ||
| for (Map.Entry<String,String> subplan : metric.getSubPlans().entrySet()) { | ||
| builder.append("<td>").append(subplan.getKey()).append(subplan.getValue()).append("</td>"); | ||
| } | ||
| } else { | ||
| builder.append("<td>NONE<td/>"); | ||
| } | ||
|
|
||
| builder.append("\n</tr>\n"); | ||
| } | ||
|
|
||
| builder.append("</table>\n<br/>\n"); | ||
| pageTimesBuilder.append("</table>\n"); | ||
|
|
||
| builder.append(pageTimesBuilder); | ||
|
|
||
| return builder.toString(); | ||
| } | ||
| } |
3 changes: 2 additions & 1 deletion
3
...ain/java/datawave/microservice/querymetric/factory/QueryMetricSubplanResponseFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| package datawave.microservice.querymetric.factory; | ||
|
|
||
| import datawave.microservice.querymetric.BaseQueryMetricSubplanResponse; | ||
| import datawave.microservice.querymetric.QueryMetricsSubplanResponse; | ||
|
|
||
| public class QueryMetricSubplanResponseFactory implements BaseQueryMetricSubplanResponseFactory { | ||
|
|
||
| @Override | ||
| public BaseQueryMetricSubplanResponse createSubplanResponse() { | ||
| return new BaseQueryMetricSubplanResponse(); | ||
| return new QueryMetricsSubplanResponse(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters