litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1129 produce better comparisons in the merged results.

Browse source
This commit is contained in:
jeb228 2011-01-20 17:11:59 +00:00
parent 1a36693cb1
commit 378acfd9dd
2 changed files with 178 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

177
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller2.java Normal file
View file

@ -0,0 +1,177 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.utilities.loadtesting;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
/**
* Write the merged data to an HTML page.
*
* This version assumes that there are three files, and that they are 1.1.1, RDB
* and SDB, in that order. It compares the SDB results to the others.
*/
public class OutputMarshaller2 {
private final List<TestResultsFileData> reportData;
private final List<TestResultsFileData> columnsToCompare;
private final TestResultsFileData columnToCompareAgainst;
private final int howManyToCompare;
private final PrintWriter w;
private final List<String> testNames;
public OutputMarshaller2(List<TestResultsFileData> reportData, PrintWriter w) {
this.reportData = reportData;
this.howManyToCompare = reportData.size() - 1;
this.columnsToCompare = reportData.subList(0, howManyToCompare);
this.columnToCompareAgainst = reportData.get(howManyToCompare);
this.w = w;
this.testNames = assembleListOfTestNames();
}
public void marshall() {
writePageHeader();
writeTestDataTable();
writePageFooter();
}
private List<String> assembleListOfTestNames() {
Set<String> names = new TreeSet<String>();
for (TestResultsFileData filedata : reportData) {
names.addAll(filedata.getTestMap().keySet());
}
return new ArrayList<String>(names);
}
private void writePageHeader() {
w.println("<html>");
w.println("<head>");
w.println(" <link REL='STYLESHEET' TYPE='text/css' HREF='./mergedResults.css'>");
w.println("</head>");
w.println("<body>");
}
private void writeTestDataTable() {
w.println("<table class='testData' cellspacing='0'>");
writeTestDataHeader();
for (String testName : testNames) {
writeTestDataRow(testName);
}
w.println("</table>");
}
private void writeTestDataHeader() {
// header first row
w.println(" <tr>");
w.println(" <th>&nbsp;</th>");
for (TestResultsFileData fileData : reportData) {
w.println(" <th colspan='2'>" + fileData.getVivoVersion()
+ "<br/>" + fileData.getResultsFilename() + "<br/>"
+ formatDate(fileData.getCreated()) + "</th>");
}
w.println(" <th colspan='" + howManyToCompare
+ "'>performance ratios</th>");
w.println(" </tr>");
// header second row
w.println(" <tr>");
w.println(" <th>Test Name</th>");
for (int i = 0; i < reportData.size(); i++) {
w.println(" <th>iterations</th>");
w.println(" <th>time (min/max)</th>");
}
for (int i = 0; i < howManyToCompare; i++) {
switch (i) {
case 0:
w.println(" <th>vs 1.1.1</th>");
break;
case 1:
w.println(" <th>vs RDB</th>");
break;
default:
w.println(" <th>&nbsp;</th>");
break;
}
}
w.println(" </tr>");
}
private void writeTestDataRow(String testName) {
w.println(" <tr>");
w.println(" <td class='left'>" + testName + "</td>");
for (TestResultsFileData fileData : reportData) {
writeTestDataCellForFile(fileData, testName);
}
for (TestResultsFileData fileData : columnsToCompare) {
writeComparisonDataCell(fileData, testName);
}
w.println(" </tr>");
}
private void writeTestDataCellForFile(TestResultsFileData fileData,
String testName) {
TestResultInfo testData = fileData.getTestMap().get(testName);
String count = (testData == null) ? "&nbsp;" : ("" + testData
.getCount());
String averageTime = (testData == null) ? "&nbsp;"
: ("" + formatTime(testData.getAverageTime()));
String minTime = (testData == null) ? "&nbsp;"
: ("" + formatTime(testData.getMinTime()));
String maxTime = (testData == null) ? "&nbsp;"
: ("" + formatTime(testData.getMaxTime()));
w.println(" <td class='open'>" + count + "</td>");
w.println(" <td>");
w.println(" <table class='oneResult close' cellspacing=0>");
w.println(" <tr>");
w.println(" <td rowspan='2'>" + averageTime + "</td>");
w.println(" <td class='minmax'>" + minTime + "</td>");
w.println(" </tr>");
w.println(" <tr>");
w.println(" <td class='minmax'>" + maxTime + "</td>");
w.println(" </tr>");
w.println(" </table>");
w.println(" </td>");
}
private void writeComparisonDataCell(TestResultsFileData fileData,
String testName) {
TestResultInfo testData = fileData.getTestMap().get(testName);
TestResultInfo baselineTestData = columnToCompareAgainst.getTestMap()
.get(testName);
String ratioWithBaseline = "&nbsp";
if ((testData != null) && (baselineTestData != null)) {
ratioWithBaseline = percentage(baselineTestData.getAverageTime(),
testData.getAverageTime());
}
w.println(" <td>" + ratioWithBaseline + "</td>");
}
private String percentage(float value, float baseline) {
float ratio = value / baseline;
return String.format("%1$8.2f%%", ratio * 100.0);
}
public String formatTime(float time) {
return String.format("%1$8.3f", time);
}
public String formatDate(long date) {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
.format(new Date(date));
}
private void writePageFooter() {
w.println("</body>");
w.println("</html>");
}
}

2
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMerger.java
View file

@ -51,7 +51,7 @@ public class ReportsMerger {
private void produceOutput() { private void produceOutput() {
PrintWriter writer = parms.getOutputWriter(); PrintWriter writer = parms.getOutputWriter();
new OutputMarshaller(reportData, writer).marshall(); new OutputMarshaller2(reportData, writer).marshall();
writer.flush(); writer.flush();
writer.close(); writer.close();
} }