Skip to content

Commit c2018f0

Browse files
authored
fix: Nightly SVG Footer Shows Variables Not Values (#395)
1 parent 4973ffc commit c2018f0

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

src/main/java/io/deephaven/benchmark/run/SvgSummary.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void summarize() {
6464
var platformProp = platformProps.get(lookupName);
6565
var benchmark = benchmarks.get(lookupName);
6666
if (platformProp != null)
67-
return platformProp.getValue(columnName);
67+
return formatPlatformValue(lookupName, platformProp.getValue(columnName));
6868
if (benchmark != null)
6969
return Numbers.formatNumber(benchmark.getValue(columnName));
7070
return "$0";
@@ -103,10 +103,16 @@ private Map<String, Row> readSummaryCsv(URL csv, String sortColumn, boolean isNu
103103
private String replacePlatformVars(String str) {
104104
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
105105
str = str.replace("${run_date}", dtf.format(LocalDateTime.now()));
106-
str = str.replace("${os_name}", "Ubuntu 22.04.1 LTS".toLowerCase().replace(" ", "-"));
106+
str = str.replace("${os_name}", "Ubuntu 22.04.5 LTS".toLowerCase().replace(" ", "-"));
107107
return str.replace("${benchmark_count}", "" + benchmarks.size());
108108
}
109109

110+
private String formatPlatformValue(String name, String value) {
111+
if (name.contains(".heap"))
112+
return Numbers.formatBytesToGigs(value);
113+
return value;
114+
}
115+
110116
class RowComparator implements Comparator<Row> {
111117
final String sortKey;
112118
final boolean isNumber;

src/main/resources/io/deephaven/benchmark/run/profile/compare-benchmark-summary.template.svg

Lines changed: 1 addition & 1 deletion
Loading

src/main/resources/io/deephaven/benchmark/run/profile/standard-benchmark-summary.template.svg

Lines changed: 1 addition & 1 deletion
Loading

src/test/java/io/deephaven/benchmark/run/SvgSummaryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void summarize() throws Exception {
3939
<tr><td>Avg By Row1</td><td>14,915,478</td><td>9,609,994</td></tr>
4040
<tr><td>Median By Row2</td><td>2,309,348</td><td>2,226,799</td></tr>
4141
</tbody>
42-
<tfoot><tr><td colspan="3">* threads=16 heap=24g os=ubuntu-22.04.1-lts benchmark-count=5</td></tr></tfoot>
42+
<tfoot><tr><td colspan="3">* threads=16 heap=24g os=ubuntu-22.04.5-lts benchmark-count=5</td></tr></tfoot>
4343
</table>
4444
</div>
4545
</foreignObject>

0 commit comments

Comments
 (0)