andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

preparation to add plots for percentiles

Browse Source
This commit is contained in:
ahr
2017-11-05 09:21:34 +01:00
parent 870ff492d9
commit 92dde94443
12 changed files with 129 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggreateInternal.java
View File

@@ -1,5 +1,5 @@
package org.lucares.pdb.plot.api;
public enum AggreateInternal {
NONE, MEAN
NONE, MEAN, PERCENTILE95, PERCENTILE99, PERCENTILE999
}

16
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandler.java Normal file
View File

@@ -0,0 +1,16 @@
package org.lucares.pdb.plot.api;
import java.util.Collection;
import org.lucares.recommind.logs.DataSeries;
public interface AggregateHandler {
void addStats(StringBuilder result, Collection<DataSeries> dataSeries);
default void appendfln(final StringBuilder builder, final String format, final Object... args) {
builder.append(String.format(format + "\n", args));
}
void addPlots(StringBuilder result, Collection<DataSeries> dataSeries);
}

30
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/MeanAggregate.java Normal file
View File

@@ -0,0 +1,30 @@
package org.lucares.pdb.plot.api;
import java.util.Collection;
import org.lucares.recommind.logs.DataSeries;
public class MeanAggregate implements AggregateHandler{
@Override
public void addStats(StringBuilder result, Collection<DataSeries> dataSeries) {
int count = 1;
for (final DataSeries dataSerie : dataSeries) {
appendfln(result, "stats '%s' using 2 prefix \"A%d\"", dataSerie.getDataFile(),count);
count++;
}
}
@Override
public void addPlots(StringBuilder result, Collection<DataSeries> dataSeries) {
int count = 1;
for (final DataSeries dataSerie : dataSeries) {
appendfln(result, "A%d_mean title '%s Mean', \\", count,
dataSerie.getTitle(), dataSerie.getTitle());
}
}
}

20
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/NullAggregate.java Normal file
View File

@@ -0,0 +1,20 @@
package org.lucares.pdb.plot.api;
import java.util.Collection;
import org.lucares.recommind.logs.DataSeries;
public class NullAggregate implements AggregateHandler {
@Override
public void addStats(StringBuilder result, Collection<DataSeries> dataSeries) {
// nothing to do; this is a Null-Object
}
@Override
public void addPlots(StringBuilder result, Collection<DataSeries> dataSeries) {
// nothing to do; this is a Null-Object
}
}

6
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java
View File

@@ -32,7 +32,7 @@ public class PlotSettings {
private AxisScale yAxisScale;
private AggreateInternal aggregate;
private AggregateHandler aggregate;
private boolean keyOutside;
@@ -163,11 +163,11 @@ public class PlotSettings {
+ ", axisScale=" + yAxisScale + ", aggregate="+aggregate+", keyOutside="+keyOutside+"]";
}
public void setAggregate(AggreateInternal aggregate) {
public void setAggregate(AggregateHandler aggregate) {
this.aggregate = aggregate;
}
public AggreateInternal getAggregate() {
public AggregateHandler getAggregate() {
return aggregate;
}

50
pdb-plotting/src/main/java/org/lucares/recommind/logs/CsvSummary.java
View File

@@ -1,21 +1,29 @@
package org.lucares.recommind.logs;
class CsvSummary {
private final int values;
private long maxValue;
public CsvSummary(final int values, long maxValue) {
super();
this.values = values;
this.maxValue = maxValue;
}
public int getValues() {
return values;
}
public long getMaxValue() {
return maxValue;
}
}
package org.lucares.recommind.logs;
import java.io.File;
class CsvSummary {
private final int values;
private long maxValue;
private File dataFile;
public CsvSummary(File dataFile, final int values, long maxValue) {
super();
this.dataFile = dataFile;
this.values = values;
this.maxValue = maxValue;
}
public File getDataFile() {
return dataFile;
}
public int getValues() {
return values;
}
public long getMaxValue() {
return maxValue;
}
}

19
pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java
View File

@@ -18,16 +18,8 @@ public class GnuplotFileGenerator {
appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator());
int count = 1;
if (settings.getAggregate() != AggreateInternal.NONE)
{
for (final DataSeries dataSerie : dataSeries) {
appendfln(result, "stats '%s' using 2 prefix \"A%d\"", dataSerie.getDataFile(),count);
count++;
}
}
settings.getAggregate().addStats(result, dataSeries);
appendfln(result, "set timefmt '%s'", settings.getTimefmt());
appendfln(result, "set xdata time");
@@ -67,16 +59,11 @@ public class GnuplotFileGenerator {
appendf(result, "plot ");
count = 1;
for (final DataSeries dataSerie : dataSeries) {
appendfln(result, "'%s' using 1:2 title '%s' with points, \\", dataSerie.getDataFile(),
dataSerie.getTitle());
if (settings.getAggregate() == AggreateInternal.MEAN) {
appendfln(result, "A%d_mean title '%s Mean', \\", count, dataSerie.getTitle(),
dataSerie.getTitle());
}
count++;
}
settings.getAggregate().addPlots(result, dataSeries);
return result.toString();
}

7
pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java
View File

@@ -3,6 +3,7 @@ package org.lucares.recommind.logs;
import java.nio.file.Path;
import org.lucares.pdb.plot.api.AggreateInternal;
import org.lucares.pdb.plot.api.AggregateHandler;
import org.lucares.pdb.plot.api.AxisScale;
public class GnuplotSettings {
@@ -31,7 +32,7 @@ public class GnuplotSettings {
private AxisScale yAxisScale;
private String dateFrom;
private String dateTo;
private AggreateInternal aggregate;
private AggregateHandler aggregate;
private boolean keyOutside = false;
public GnuplotSettings(final Path output) {
@@ -138,11 +139,11 @@ public class GnuplotSettings {
return dateTo;
}
public void setAggregate(AggreateInternal aggregate) {
public void setAggregate(AggregateHandler aggregate) {
this.aggregate = aggregate;
}
public AggreateInternal getAggregate() {
public AggregateHandler getAggregate() {
return aggregate;
}

16
pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java
View File

@@ -26,6 +26,8 @@ import org.lucares.pdb.api.Entry;
import org.lucares.pdb.api.GroupResult;
import org.lucares.pdb.api.Result;
import org.lucares.pdb.api.Tags;
import org.lucares.pdb.plot.api.AggreateInternal;
import org.lucares.pdb.plot.api.AggregateHandler;
import org.lucares.pdb.plot.api.Limit;
import org.lucares.pdb.plot.api.PlotSettings;
import org.lucares.performance.db.PerformanceDb;
@@ -94,11 +96,10 @@ public class Plotter {
final Stream<Entry> entries = groupResult.asStream();
final File dataFile = File.createTempFile("data", ".dat", tmpDir.toFile());
final CsvSummary csvSummary = toCsv(entries, dataFile, dateFrom, dateTo);
final CsvSummary csvSummary = toCsv(entries, tmpDir, dateFrom, dateTo, plotSettings);
final String title = title(groupResult.getGroupedBy(), csvSummary.getValues());
final DataSeries dataSerie = new DataSeries(dataFile, title, csvSummary.getValues(), csvSummary.getMaxValue());
final DataSeries dataSerie = new DataSeries(csvSummary.getDataFile(), title, csvSummary.getValues(), csvSummary.getMaxValue());
if (dataSerie.getValues() > 0) {
dataSeries.add(dataSerie);
}
@@ -223,14 +224,17 @@ public class Plotter {
}
private static CsvSummary toCsv(final Stream<Entry> entries, final File dataFile, final OffsetDateTime dateFrom,
final OffsetDateTime dateTo) throws IOException {
private static CsvSummary toCsv(final Stream<Entry> entries, final Path tmpDir, final OffsetDateTime dateFrom,
final OffsetDateTime dateTo, PlotSettings plotSettings) throws IOException {
final File dataFile = File.createTempFile("data", ".dat", tmpDir.toFile());
final long start = System.nanoTime();
int count = 0;
final long fromEpochMilli = dateFrom.toInstant().toEpochMilli();
final long toEpochMilli = dateTo.toInstant().toEpochMilli();
final boolean useMillis = (toEpochMilli - fromEpochMilli) < TimeUnit.MINUTES.toMillis(5);
final AggregateHandler aggregate = plotSettings.getAggregate();
long maxValue = 0;
long ignoredValues = 0;
@@ -271,7 +275,7 @@ public class Plotter {
}
METRICS_LOGGER.debug("wrote {} values to csv in: {}ms (ignored {} values) use millis: {}", count, (System.nanoTime() - start) / 1_000_000.0, ignoredValues, Boolean.toString(useMillis));
return new CsvSummary(count, maxValue);
return new CsvSummary(dataFile, count, maxValue);
}
private static String longToString(final long value){

12
pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java
View File

@@ -1,8 +1,11 @@
package org.lucares.pdbui;
import org.lucares.pdb.plot.api.AggreateInternal;
import org.lucares.pdb.plot.api.AggregateHandler;
import org.lucares.pdb.plot.api.AxisScale;
import org.lucares.pdb.plot.api.Limit;
import org.lucares.pdb.plot.api.MeanAggregate;
import org.lucares.pdb.plot.api.NullAggregate;
import org.lucares.pdb.plot.api.PlotSettings;
import org.lucares.pdbui.domain.Aggregate;
import org.lucares.pdbui.domain.LimitBy;
@@ -29,10 +32,13 @@ class PlotSettingsTransformer {
return result;
}
private static AggreateInternal toAggregateInternal(Aggregate aggregate) {
private static AggregateHandler toAggregateInternal(Aggregate aggregate) {
switch (aggregate) {
case NONE:return AggreateInternal.NONE;
case MEAN:return AggreateInternal.MEAN;
case NONE:return new NullAggregate();
case MEAN:return new MeanAggregate();
case PERCENTILE95:return new NullAggregate();
case PERCENTILE99:return new NullAggregate();
case PERCENTILE999:return new NullAggregate();
}
throw new IllegalStateException("unhandled enum: " + aggregate);
}

2
pdb-ui/src/main/java/org/lucares/pdbui/domain/Aggregate.java
View File

@@ -1,5 +1,5 @@
package org.lucares.pdbui.domain;
public enum Aggregate {
NONE, MEAN
NONE, MEAN, PERCENTILE95, PERCENTILE99, PERCENTILE999
}

3
pdb-ui/src/main/resources/templates/main.html
View File

@@ -70,6 +70,9 @@
<select id="show-aggregate">
<option value="NONE" selected="selected">-</option>
<option value="MEAN">Mean</option>
<option value="PERCENTILE95">95% percentile</option>
<option value="PERCENTILE99">99% percentile</option>
<option value="PERCENTILE999">99.9% percentile</option>
</select>
</div>
<div class="group">