Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show only tracked commits

Browse source
This commit is contained in:
Joscha 2023-08-15 00:59:35 +02:00
parent 476fd84d2d
commit 33ca3207e7
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.sqlx/query-9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95.json → .sqlx/query-75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e.json generated
View file

@ -1,6 +1,6 @@
{ {
"db_name": "SQLite", "db_name": "SQLite",
"query": "WITH measurements AS ( SELECT hash, value, MAX(start) FROM runs JOIN run_measurements USING (id) WHERE name = ? GROUP BY hash ) SELECT value FROM commits LEFT JOIN measurements USING (hash) ORDER BY unixepoch(committer_date) ASC, hash ASC ", "query": "WITH measurements AS ( SELECT hash, value, MAX(start) FROM runs JOIN run_measurements USING (id) WHERE name = ? GROUP BY hash ) SELECT value FROM commits LEFT JOIN measurements USING (hash) WHERE reachable = 2 ORDER BY unixepoch(committer_date) ASC, hash ASC ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@ -16,5 +16,5 @@
true true
] ]
}, },
"hash": "9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95" "hash": "75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e"
} }

3
src/server/web/pages/graph.rs
View file

@ -75,6 +75,8 @@ pub async fn get_graph_data(
times.push(row.committer_date.unix_timestamp()); times.push(row.committer_date.unix_timestamp());
} }
// TODO Somehow sort topologically if committer_date is the same
// TODO Overhaul indices once I know how the query looks
let mut metrics = HashMap::new(); let mut metrics = HashMap::new();
for metric in form.metric { for metric in form.metric {
let values = sqlx::query_scalar!( let values = sqlx::query_scalar!(
@ -90,6 +92,7 @@ pub async fn get_graph_data(
SELECT value \ SELECT value \
FROM commits \ FROM commits \
LEFT JOIN measurements USING (hash) \ LEFT JOIN measurements USING (hash) \
WHERE reachable = 2 \
ORDER BY unixepoch(committer_date) ASC, hash ASC \ ORDER BY unixepoch(committer_date) ASC, hash ASC \
", ",
metric, metric,