Skip to content

Commit 37c740d

Browse files
committed
lift NVME vs S3 to group-level
1 parent 29df518 commit 37c740d

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

benchmarks-website/code.js

+8-15
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@ window.initAndRender = (function () {
44
// Random colours are generally pretty disgusting...
55
const MAP = {
66
"arrow": '#58067e',
7-
87
"parquet": '#ef7f1d',
9-
"parquet (nvme)": '#ef7f1d',
10-
"parquet (s3)": '#f0b078',
11-
128
"vortex-file-compressed": '#23d100',
13-
"vortex-file-compressed (nvme)": '#23d100',
14-
"vortex-file-compressed (s3)": '#7ad169',
159
};
1610

1711
if (MAP[str]) {
@@ -39,7 +33,8 @@ window.initAndRender = (function () {
3933
let groups = {
4034
"Random Access": new Map(),
4135
"Compression": new Map(),
42-
"TPC-H": new Map(),
36+
"TPC-H (NVME)": new Map(),
37+
"TPC-H (S3)": new Map(),
4338
"Clickbench": new Map(),
4439
};
4540

@@ -71,9 +66,10 @@ window.initAndRender = (function () {
7166
} else if (name.includes("compress time/")) {
7267
group = groups["Compression"];
7368
} else if (name.startsWith("tpch_q")) {
74-
group = groups["TPC-H"];
75-
if (storage === undefined && (name.includes("parquet") || name.includes("vortex"))) {
76-
storage = "nvme"
69+
if (storage === undefined || storage == "nvme") {
70+
group = groups["TPC-H (NVME)"];
71+
} else {
72+
group = groups["TPC-H (S3)"];
7773
}
7874
} else if (name.startsWith("clickbench")) {
7975
group = groups["Clickbench"];
@@ -93,10 +89,6 @@ window.initAndRender = (function () {
9389
q = q.replace("time", "throughput");
9490
}
9591

96-
if (storage !== undefined) {
97-
seriesName += " (" + storage + ")"
98-
}
99-
10092
let prettyQ = q.replace("_", " ")
10193
.toUpperCase()
10294
.replace("VORTEX:RAW SIZE", "VORTEX COMPRESSION RATIO");
@@ -349,7 +341,8 @@ window.initAndRender = (function () {
349341
}
350342

351343
function initAndRender(keptGroups) {
352-
let data = fetch('https://vortex-benchmark-results-database.s3.amazonaws.com/data.json')
344+
// let data = fetch('https://vortex-benchmark-results-database.s3.amazonaws.com/data.json')
345+
let data = fetch('data.json')
353346
.then(response => response.text())
354347
.then(parse_jsonl)
355348
.catch(error => console.error('unable to load data.json:', error));

benchmarks-website/index.html

+12-6
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,23 @@
3838
]),
3939
"renamedDatasets": undefined,
4040
}],
41-
["TPC-H", {
41+
["TPC-H (NVME)", {
4242
"keptCharts": undefined,
4343
"hiddenDatasets": undefined,
4444
"removedDatasets": new Set([
45-
"vortex-in-memory-no-pushdown (nvme)",
46-
"vortex-in-memory-pushdown (nvme)",
47-
"vortex-file-uncompressed (nvme)",
45+
"vortex-in-memory-no-pushdown",
46+
"vortex-in-memory-pushdown",
47+
"vortex-file-uncompressed",
4848
]),
4949
"renamedDatasets": {
50-
"vortex-file-compressed (nvme)": "vortex (nvme)",
51-
"vortex-file-compressed (s3)": "vortex (s3)",
50+
"vortex-file-compressed": "vortex",
51+
},
52+
}],
53+
["TPC-H (S3)", {
54+
"keptCharts": undefined,
55+
"hiddenDatasets": undefined,
56+
"renamedDatasets": {
57+
"vortex-file-compressed": "vortex",
5258
},
5359
}],
5460
["Clickbench", {

0 commit comments

Comments
 (0)